openstack
/
heat-agents
Code Issues Proposed changes

Merge "Fix: all containers are being set privileged"

This commit is contained in:
Jenkins 2017-01-17 09:02:50 +00:00 committed by Gerrit Code Review
parent ee72509c97 ccbfef9cb4
commit 4c86787c82
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
heat-config-docker-cmd/install.d/hook-docker-cmd.py
View File

@ -42,7 +42,7 @@ def docker_arg_map(key, value):
'image': value,
'net': "--net=%s" % value,
'pid': "--pid=%s" % value,
'privileged': "--privileged=%s" % 'true' if value else 'false',
'privileged': "--privileged=%s" % value.lower(),
'restart': "--restart=%s" % value,
'user': "--user=%s" % value,
'volumes': "--volume=%s" % value,

5
tests/test_hook_docker_cmd.py
View File

@ -29,7 +29,8 @@ class HookDockerCmdTest(common.RunScriptTest):
"config": {
"web": {
"name": "x",
"image": "xxx"
"image": "xxx",
"privileged": False
},
"web-ls": {
"action": "exec",
@ -129,6 +130,7 @@ class HookDockerCmdTest(common.RunScriptTest):
'--name',
'web',
'--detach=true',
'--privileged=false',
'xxx'
], state_1['args'])
self.assertEqual([
@ -183,6 +185,7 @@ class HookDockerCmdTest(common.RunScriptTest):
'--name',
'web',
'--detach=true',
'--privileged=false',
'xxx'
], state_1['args'])