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 /ansible | |
| parent | e179d46f521faa20a396d5734303b67a94d50d8c (diff) | |
| parent | 3f134d0f53067004314fddeb1a77b036c547e45f (diff) | |
| download | kolla-c241e2adf6b822e1fc4fa0b8bc6cb6be486c9480.tar.gz kolla-c241e2adf6b822e1fc4fa0b8bc6cb6be486c9480.zip | |
Merge "Changed docker_restart_policy to unless-stopped"
Diffstat (limited to 'ansible')
| -rw-r--r-- | ansible/group_vars/all.yml | 4 | ||||
| -rw-r--r-- | ansible/library/kolla_docker.py | 15 |
2 files changed, 12 insertions, 7 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'), |