openstack/kolla-ansible
Code Issues Proposed changes

Merge "Fix docker restart policy issue on docker engine 1.13"

Browse Source
This commit is contained in:
Jenkins 2017-01-21 18:44:25 +00:00 committed by Gerrit Code Review
commit ee2ce24eef
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', if self.params.get('restart_policy') in ['on-failure',
'always', 'always',
'unless-stopped']: 'unless-stopped']:
options['restart_policy'] = { policy = {'Name': self.params.get('restart_policy')}
'Name': self.params.get('restart_policy'), # NOTE(Jeffrey4l): MaximumRetryCount is only needed for on-failure
'MaximumRetryCount': self.params.get('restart_retries') # policy
} if self.params.get('restart_policy') == 'on-failure':
retries = self.params.get('restart_retries')
policy['MaximumRetryCount'] = retries
options['restart_policy'] = policy
if binds: if binds:
options['binds'] = binds options['binds'] = binds