openstack/kolla-ansible
Code Issues Proposed changes

Fix docker restart policy issue on docker engine 1.13

Browse Source 
Docker v1.25 api now validates restart policies[0]

[0] https://github.com/docker/docker/blob/master/docs/api/version-history.md

Change-Id: Idc90cb99cf38ab1e637568ee5dbe5adcb2fa5b78
Closes-Bug: #1657946
This commit is contained in:
Jeffrey Zhang 2017-01-20 16:32:31 +08:00
parent 4b5b14948b
commit 69b985f1b6
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ansible/library/kolla_docker.py
View File

@ -523,10 +523,13 @@ class DockerWorker(object):
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')
}
policy = {'Name': self.params.get('restart_policy')}
# NOTE(Jeffrey4l): MaximumRetryCount is only needed for on-failure
# policy
if self.params.get('restart_policy') == 'on-failure':
retries = self.params.get('restart_retries')
policy['MaximumRetryCount'] = retries
options['restart_policy'] = policy
if binds:
options['binds'] = binds