Merge "Fix container security_opts type"
This commit is contained in:
commit
4ef66a7386
|
@ -252,7 +252,8 @@ outputs:
|
||||||
image: {get_param: ContainerHAProxyImage}
|
image: {get_param: ContainerHAProxyImage}
|
||||||
net: host
|
net: host
|
||||||
restart: always
|
restart: always
|
||||||
security_opt: label=disable
|
security_opt:
|
||||||
|
- label=disable
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
|
|
@ -146,7 +146,8 @@ outputs:
|
||||||
image: *ironic_pxe_image
|
image: *ironic_pxe_image
|
||||||
net: host
|
net: host
|
||||||
privileged: false
|
privileged: false
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
restart: always
|
restart: always
|
||||||
healthcheck:
|
healthcheck:
|
||||||
test: /openstack/healthcheck
|
test: /openstack/healthcheck
|
||||||
|
|
|
@ -243,7 +243,8 @@ outputs:
|
||||||
privileged: true
|
privileged: true
|
||||||
user: root
|
user: root
|
||||||
restart: always
|
restart: always
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
volumes:
|
volumes:
|
||||||
list_concat:
|
list_concat:
|
||||||
- {get_attr: [ContainersCommon, volumes]}
|
- {get_attr: [ContainersCommon, volumes]}
|
||||||
|
|
|
@ -98,7 +98,8 @@ outputs:
|
||||||
pid: host
|
pid: host
|
||||||
user: root
|
user: root
|
||||||
privileged: true
|
privileged: true
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
command:
|
command:
|
||||||
- puppet
|
- puppet
|
||||||
- apply
|
- apply
|
||||||
|
|
|
@ -321,7 +321,8 @@ outputs:
|
||||||
pid: host
|
pid: host
|
||||||
privileged: true
|
privileged: true
|
||||||
restart: always
|
restart: always
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
depends_on:
|
depends_on:
|
||||||
- openvswitch.service
|
- openvswitch.service
|
||||||
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
|
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}
|
||||||
|
|
|
@ -153,7 +153,8 @@ outputs:
|
||||||
pid: host
|
pid: host
|
||||||
user: root
|
user: root
|
||||||
privileged: true
|
privileged: true
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
command:
|
command:
|
||||||
- puppet
|
- puppet
|
||||||
- apply
|
- apply
|
||||||
|
|
|
@ -306,7 +306,8 @@ outputs:
|
||||||
pid: host
|
pid: host
|
||||||
user: root
|
user: root
|
||||||
privileged: true
|
privileged: true
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
command:
|
command:
|
||||||
- puppet
|
- puppet
|
||||||
- apply
|
- apply
|
||||||
|
@ -337,7 +338,8 @@ outputs:
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
privileged: true
|
privileged: true
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- openvswitch.service
|
- openvswitch.service
|
||||||
|
|
|
@ -1320,7 +1320,8 @@ outputs:
|
||||||
image: &nova_compute_image {get_param: ContainerNovaComputeImage}
|
image: &nova_compute_image {get_param: ContainerNovaComputeImage}
|
||||||
net: none
|
net: none
|
||||||
user: root
|
user: root
|
||||||
security_opt: label=disable
|
security_opt:
|
||||||
|
- label=disable
|
||||||
privileged: false
|
privileged: false
|
||||||
detach: false
|
detach: false
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -141,7 +141,8 @@ outputs:
|
||||||
image: &nova_ironic_image {get_param: ContainerNovaComputeIronicImage}
|
image: &nova_ironic_image {get_param: ContainerNovaComputeIronicImage}
|
||||||
net: none
|
net: none
|
||||||
user: root
|
user: root
|
||||||
security_opt: label=disable
|
security_opt:
|
||||||
|
- label=disable
|
||||||
privileged: false
|
privileged: false
|
||||||
detach: false
|
detach: false
|
||||||
volumes:
|
volumes:
|
||||||
|
|
|
@ -639,7 +639,8 @@ outputs:
|
||||||
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
ulimit: {get_param: ContainerNovaLibvirtUlimit}
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
security_opt: label=disable
|
security_opt:
|
||||||
|
- label=disable
|
||||||
privileged: true
|
privileged: true
|
||||||
restart: always
|
restart: always
|
||||||
healthcheck:
|
healthcheck:
|
||||||
|
@ -777,7 +778,8 @@ outputs:
|
||||||
- nova_libvirt_init_secret:
|
- nova_libvirt_init_secret:
|
||||||
detach: false
|
detach: false
|
||||||
image: {get_param: ContainerNovaLibvirtImage}
|
image: {get_param: ContainerNovaLibvirtImage}
|
||||||
security_opt: label=disable
|
security_opt:
|
||||||
|
- label=disable
|
||||||
privileged: false
|
privileged: false
|
||||||
user: root
|
user: root
|
||||||
net: host
|
net: host
|
||||||
|
|
|
@ -54,7 +54,8 @@ outputs:
|
||||||
net: host
|
net: host
|
||||||
pid: host
|
pid: host
|
||||||
privileged: true
|
privileged: true
|
||||||
security_opt: 'label=disable'
|
security_opt:
|
||||||
|
- label=disable
|
||||||
restart: always
|
restart: always
|
||||||
depends_on:
|
depends_on:
|
||||||
- openvswitch.service
|
- openvswitch.service
|
||||||
|
|
Loading…
Reference in New Issue