diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-09-27 13:53:45 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-09-27 13:53:46 +0000 |
| commit | c241e2adf6b822e1fc4fa0b8bc6cb6be486c9480 (patch) | |
| tree | 35a69fce2a53813774a850794f77a7ba3638a6e3 | |
| parent | e179d46f521faa20a396d5734303b67a94d50d8c (diff) | |
| parent | 3f134d0f53067004314fddeb1a77b036c547e45f (diff) | |
| download | kolla-c241e2adf6b822e1fc4fa0b8bc6cb6be486c9480.tar.gz kolla-c241e2adf6b822e1fc4fa0b8bc6cb6be486c9480.zip | |
Merge "Changed docker_restart_policy to unless-stopped"
| -rw-r--r-- | ansible/group_vars/all.yml | 4 | ||||
| -rw-r--r-- | ansible/library/kolla_docker.py | 15 | ||||
| -rw-r--r-- | kolla/image/build.py | 2 | ||||
| -rw-r--r-- | tests/test_kolla_docker.py | 21 |
4 files changed, 24 insertions, 18 deletions
diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 52e7db6df..c708e8cdb 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -72,8 +72,8 @@ docker_registry: docker_namespace: "kolla" docker_registry_username: -# Valid options are [ never, on-failure, always ] -docker_restart_policy: "always" +# Valid options are [ never, on-failure, always, unless-stopped ] +docker_restart_policy: "unless-stopped" # '0' means unlimited retries docker_restart_policy_retry: "10" diff --git a/ansible/library/kolla_docker.py b/ansible/library/kolla_docker.py index 6ef4556e2..0f2bd44a2 100644 --- a/ansible/library/kolla_docker.py +++ b/ansible/library/kolla_docker.py @@ -145,6 +145,7 @@ options: - never - on-failure - always + - unless-stopped restart_retries: description: - How many times to attempt a restart if restart_policy is set @@ -511,7 +512,9 @@ class DockerWorker(object): 'volumes_from': self.params.get('volumes_from') } - if self.params.get('restart_policy') in ['on-failure', 'always']: + if self.params.get('restart_policy') in ['on-failure', + 'always', + 'unless-stopped']: options['restart_policy'] = { 'Name': self.params.get('restart_policy'), 'MaximumRetryCount': self.params.get('restart_retries') @@ -674,10 +677,12 @@ def generate_module(): pid_mode=dict(required=False, type='str', choices=['host']), privileged=dict(required=False, type='bool', default=False), remove_on_exit=dict(required=False, type='bool', default=True), - restart_policy=dict(required=False, type='str', choices=['no', - 'never', - 'on-failure', - 'always']), + restart_policy=dict(required=False, type='str', choices=[ + 'no', + 'never', + 'on-failure', + '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'), diff --git a/kolla/image/build.py b/kolla/image/build.py index 27d06b302..0684c3c18 100644 --- a/kolla/image/build.py +++ b/kolla/image/build.py @@ -825,7 +825,7 @@ class KollaWorker(object): for plugin in [match.group(0) for match in (re.search('{}-plugin-.+'.format(image.name), section) for section in - self.conf.list_all_sections()) if match]: + self.conf.list_all_sections()) if match]: try: self.conf.register_opts( common_config.get_source_opts(), 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): |