openstack
/
kolla-ansible
Code Issues Proposed changes

Merge "Fix ipc_mode comparison in the latest docker" into stable/pike

This commit is contained in:
Zuul 2018-04-12 11:38:47 +00:00 committed by Gerrit Code Review
parent 11a4fbba26 ec4cd5b592
commit e978c8d1e8
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
ansible/library/kolla_docker.py
View File

@ -300,8 +300,10 @@ class DockerWorker(object):
if not current_ipc_mode:
current_ipc_mode = None
if new_ipc_mode != current_ipc_mode:
# only check IPC mode if it is specified
if new_ipc_mode is not None and new_ipc_mode != current_ipc_mode:
return True
return False
def compare_cap_add(self, container_info):
new_cap_add = self.params.get('cap_add', list())
@ -728,7 +730,10 @@ def generate_module():
name=dict(required=False, type='str'),
environment=dict(required=False, type='dict'),
image=dict(required=False, type='str'),
ipc_mode=dict(required=False, type='str', choices=['host', '']),
ipc_mode=dict(required=False, type='str', choices=['',
'host',
'private',
'shareable']),
cap_add=dict(required=False, type='list', default=list()),
security_opt=dict(required=False, type='list', default=list()),
pid_mode=dict(required=False, type='str', choices=['host', '']),

5
tests/test_kolla_docker.py
View File

@ -57,7 +57,10 @@ class ModuleArgsTest(base.BaseTestCase):
name=dict(required=False, type='str'),
environment=dict(required=False, type='dict'),
image=dict(required=False, type='str'),
ipc_mode=dict(required=False, type='str', choices=['host', '']),
ipc_mode=dict(required=False, type='str', choices=['',
'host',
'private',
'shareable']),
cap_add=dict(required=False, type='list', default=list()),
security_opt=dict(required=False, type='list', default=list()),
pid_mode=dict(required=False, type='str', choices=['host', '']),