openstack/kolla-ansible
Code Issues Proposed changes

Fix the pid_mode and ipc_mode value check for kolla_docker module

Browse Source 
bypass_checks is disabled by Ib2e19794bbe804470a880253d5870254041358c8 .
But we use pid_mode: "{{ service.pid_mode | default('') }}" pattern in
the yaml file. whereas pid_mode only support "host" value, this patch
add '' as a choice of these two parameters.

Change-Id: Ib83ed5e437ca868f0e42ce740ad1125d2fa48ff4
This commit is contained in:
Jeffrey Zhang 2017-02-03 15:04:04 +08:00
parent 2c5c9daeb1
commit a3acd2c439
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ansible/library/kolla_docker.py
View File

@ -675,6 +675,8 @@ class DockerWorker(object):
def generate_module(): def generate_module():
# NOTE(jeffrey4l): add empty string '' to choices let us use
# pid_mode: "{{ service.pid_mode | default ('') }}" in yaml
argument_spec = dict( argument_spec = dict(
common_options=dict(required=False, type='dict', default=dict()), common_options=dict(required=False, type='dict', default=dict()),
action=dict(required=True, type='str', action=dict(required=True, type='str',
@ -695,10 +697,10 @@ def generate_module():
name=dict(required=False, type='str'), name=dict(required=False, type='str'),
environment=dict(required=False, type='dict'), environment=dict(required=False, type='dict'),
image=dict(required=False, type='str'), image=dict(required=False, type='str'),
ipc_mode=dict(required=False, type='str', choices=['host']), ipc_mode=dict(required=False, type='str', choices=['host', '']),
cap_add=dict(required=False, type='list', default=list()), cap_add=dict(required=False, type='list', default=list()),
security_opt=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']), pid_mode=dict(required=False, type='str', choices=['host', '']),
privileged=dict(required=False, type='bool', default=False), privileged=dict(required=False, type='bool', default=False),
remove_on_exit=dict(required=False, type='bool', default=True), remove_on_exit=dict(required=False, type='bool', default=True),
restart_policy=dict(required=False, type='str', choices=[ restart_policy=dict(required=False, type='str', choices=[

4
tests/test_kolla_docker.py
View File

@ -60,10 +60,10 @@ class ModuleArgsTest(base.BaseTestCase):
name=dict(required=False, type='str'), name=dict(required=False, type='str'),
environment=dict(required=False, type='dict'), environment=dict(required=False, type='dict'),
image=dict(required=False, type='str'), image=dict(required=False, type='str'),
ipc_mode=dict(required=False, type='str', choices=['host']), ipc_mode=dict(required=False, type='str', choices=['host', '']),
cap_add=dict(required=False, type='list', default=list()), cap_add=dict(required=False, type='list', default=list()),
security_opt=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']), pid_mode=dict(required=False, type='str', choices=['host', '']),
privileged=dict(required=False, type='bool', default=False), privileged=dict(required=False, type='bool', default=False),
remove_on_exit=dict(required=False, type='bool', default=True), remove_on_exit=dict(required=False, type='bool', default=True),
restart_policy=dict( restart_policy=dict(