openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Fix container security_opts type" into stable/wallaby

This commit is contained in:
Zuul 2021-06-16 20:19:17 +00:00 committed by Gerrit Code Review
parent de06509a91 7dea661f69
commit 41e385ff1e
11 changed files with 26 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
deployment/haproxy/haproxy-container-puppet.yaml
View File

@ -252,7 +252,8 @@ outputs:
image: {get_param: ContainerHAProxyImage}
net: host
restart: always
security_opt: label=disable
security_opt:
- label=disable
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

3
deployment/ironic/ironic-pxe-container-puppet.yaml
View File

@ -146,7 +146,8 @@ outputs:
image: *ironic_pxe_image
net: host
privileged: false
security_opt: 'label=disable'
security_opt:
- label=disable
restart: always
healthcheck:
test: /openstack/healthcheck

3
deployment/logging/rsyslog-container-puppet.yaml
View File

@ -227,7 +227,8 @@ outputs:
privileged: true
user: root
restart: always
security_opt: 'label=disable'
security_opt:
- label=disable
volumes:
list_concat:
- {get_attr: [ContainersCommon, volumes]}

3
deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
View File

@ -99,7 +99,8 @@ outputs:
pid: host
user: root
privileged: true
security_opt: 'label=disable'
security_opt:
- label=disable
command:
- puppet
- apply

3
deployment/neutron/neutron-dhcp-container-puppet.yaml
View File

@ -327,7 +327,8 @@ outputs:
pid: host
privileged: true
restart: always
security_opt: 'label=disable'
security_opt:
- label=disable
depends_on:
- openvswitch.service
healthcheck: {get_attr: [ContainersCommon, healthcheck_rpc_port]}

3
deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
View File

@ -154,7 +154,8 @@ outputs:
pid: host
user: root
privileged: true
security_opt: 'label=disable'
security_opt:
- label=disable
command:
- puppet
- apply

6
deployment/neutron/neutron-ovs-agent-container-puppet.yaml
View File

@ -308,7 +308,8 @@ outputs:
pid: host
user: root
privileged: true
security_opt: 'label=disable'
security_opt:
- label=disable
command:
- puppet
- apply
@ -342,7 +343,8 @@ outputs:
net: host
pid: host
privileged: true
security_opt: 'label=disable'
security_opt:
- label=disable
restart: always
depends_on:
- openvswitch.service

3
deployment/nova/nova-compute-container-puppet.yaml
View File

@ -1310,7 +1310,8 @@ outputs:
image: &nova_compute_image {get_param: ContainerNovaComputeImage}
net: none
user: root
security_opt: label=disable
security_opt:
- label=disable
privileged: false
detach: false
volumes:

3
deployment/nova/nova-ironic-container-puppet.yaml
View File

@ -141,7 +141,8 @@ outputs:
image: &nova_ironic_image {get_param: ContainerNovaComputeIronicImage}
net: none
user: root
security_opt: label=disable
security_opt:
- label=disable
privileged: false
detach: false
volumes:

6
deployment/nova/nova-libvirt-container-puppet.yaml
View File

@ -574,7 +574,8 @@ outputs:
ulimit: {get_param: ContainerNovaLibvirtUlimit}
net: host
pid: host
security_opt: label=disable
security_opt:
- label=disable
privileged: true
restart: always
healthcheck:
@ -701,7 +702,8 @@ outputs:
- nova_libvirt_init_secret:
detach: false
image: {get_param: ContainerNovaLibvirtImage}
security_opt: label=disable
security_opt:
- label=disable
privileged: false
user: root
net: host

3
deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml
View File

@ -54,7 +54,8 @@ outputs:
net: host
pid: host
privileged: true
security_opt: 'label=disable'
security_opt:
- label=disable
restart: always
depends_on:
- openvswitch.service