Merge "[c9] nova_libvirt with host's cgroupns" into stable/wallaby
This commit is contained in:
commit
0ae9cd7571
|
@ -522,6 +522,7 @@ outputs:
|
||||||
create_virtlogd_wrapper:
|
create_virtlogd_wrapper:
|
||||||
start_order: 1
|
start_order: 1
|
||||||
detach: false
|
detach: false
|
||||||
|
cgroupns: host
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
user: root
|
user: root
|
||||||
|
@ -548,6 +549,7 @@ outputs:
|
||||||
start_order: 0
|
start_order: 0
|
||||||
image: {get_param: ContainerNovaLibvirtImage}
|
image: {get_param: ContainerNovaLibvirtImage}
|
||||||
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
||||||
|
cgroupns: host
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
security_opt: label=disable
|
security_opt: label=disable
|
||||||
|
@ -580,6 +582,7 @@ outputs:
|
||||||
start_order: 1
|
start_order: 1
|
||||||
image: {get_param: ContainerNovaLibvirtImage}
|
image: {get_param: ContainerNovaLibvirtImage}
|
||||||
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
||||||
|
cgroupns: host
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
pids_limit: {get_param: ContainerNovaLibvirtPidsLimit}
|
pids_limit: {get_param: ContainerNovaLibvirtPidsLimit}
|
||||||
|
@ -647,6 +650,7 @@ outputs:
|
||||||
- label=disable
|
- label=disable
|
||||||
privileged: false
|
privileged: false
|
||||||
user: root
|
user: root
|
||||||
|
cgroupns: host
|
||||||
net: host
|
net: host
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
|
|
Loading…
Reference in New Issue