From 3f134d0f53067004314fddeb1a77b036c547e45f Mon Sep 17 00:00:00 2001
From: Sajauddin Mohammad <sajauddin_mohammad@persistent.co.in>
Date: Fri, 23 Sep 2016 02:25:23 -0400
Subject: Changed docker_restart_policy to unless-stopped

Current implementation has docker_restart_policy "always" and
docker_restart_policy_retry:"10" which should be mutually exclusive.
"unless-stopped" will restart the containers on any exit state
but not start on daemon startup if container was put to stopped state before.
Closes-Bug: #1621187

Change-Id: I4d881cd123a55625121b7a9047385e9b54e2e129
---
 tests/test_kolla_docker.py | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'tests/test_kolla_docker.py')

diff --git a/tests/test_kolla_docker.py b/tests/test_kolla_docker.py
index b9e7dadca..7e9b97650 100644
--- a/tests/test_kolla_docker.py
+++ b/tests/test_kolla_docker.py
@@ -73,7 +73,8 @@ class ModuleArgsTest(base.BaseTestCase):
                 required=False, type='str', choices=['no',
                                                      'never',
                                                      'on-failure',
-                                                     'always']),
+                                                     'always',
+                                                     'unless-stopped']),
             restart_retries=dict(required=False, type='int', default=10),
             tls_verify=dict(required=False, type='bool', default=False),
             tls_cert=dict(required=False, type='str'),
@@ -107,7 +108,7 @@ FAKE_DATA = {
             'pid_mode': '',
             'privileged': False,
             'volumes_from': None,
-            'restart_policy': 'always',
+            'restart_policy': 'unless-stopped',
             'restart_retries': 10},
         'labels': {'build-date': '2016-06-02',
                    'kolla_version': '2.0.1',
@@ -516,14 +517,14 @@ class TestVolume(base.BaseTestCase):
         self.fake_data = copy.deepcopy(FAKE_DATA)
         self.volumes = {
             'Volumes':
-                [{'Driver': u'local',
-                  'Labels': None,
-                  'Mountpoint': '/var/lib/docker/volumes/nova_compute/_data',
-                  'Name': 'nova_compute'},
-                 {'Driver': 'local',
-                  'Labels': None,
-                  'Mountpoint': '/var/lib/docker/volumes/mariadb/_data',
-                  'Name': 'mariadb'}]
+            [{'Driver': u'local',
+              'Labels': None,
+              'Mountpoint': '/var/lib/docker/volumes/nova_compute/_data',
+              'Name': 'nova_compute'},
+             {'Driver': 'local',
+              'Labels': None,
+              'Mountpoint': '/var/lib/docker/volumes/mariadb/_data',
+              'Name': 'mariadb'}]
         }
 
     def test_create_volume(self):
-- 
cgit v1.2.3