Browse Source

Merge "Fix container security_opts type"

changes/59/790459/3
Zuul 2 months ago
committed by Gerrit Code Review
parent
commit
4ef66a7386
  1. 3
      deployment/haproxy/haproxy-container-puppet.yaml
  2. 3
      deployment/ironic/ironic-pxe-container-puppet.yaml
  3. 3
      deployment/logging/rsyslog-container-puppet.yaml
  4. 3
      deployment/neutron/neutron-agents-ib-config-container-puppet.yaml
  5. 3
      deployment/neutron/neutron-dhcp-container-puppet.yaml
  6. 3
      deployment/neutron/neutron-mlnx-agent-container-puppet.yaml
  7. 6
      deployment/neutron/neutron-ovs-agent-container-puppet.yaml
  8. 3
      deployment/nova/nova-compute-container-puppet.yaml
  9. 3
      deployment/nova/nova-ironic-container-puppet.yaml
  10. 6
      deployment/nova/nova-libvirt-container-puppet.yaml
  11. 3
      deployment/openvswitch/openvswitch-dpdk-netcontrold-container-ansible.yaml

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

@ -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

@ -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

@ -243,7 +243,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

@ -98,7 +98,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

@ -321,7 +321,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

@ -153,7 +153,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

@ -306,7 +306,8 @@ outputs:
pid: host
user: root
privileged: true
security_opt: 'label=disable'
security_opt:
- label=disable
command:
- puppet
- apply
@ -337,7 +338,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

@ -1320,7 +1320,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

@ -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

@ -639,7 +639,8 @@ outputs:
ulimit: {get_param: ContainerNovaLibvirtUlimit}
net: host
pid: host
security_opt: label=disable
security_opt:
- label=disable
privileged: true
restart: always
healthcheck:
@ -777,7 +778,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

@ -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

Loading…
Cancel
Save