Browse Source

Merge "Allow container healthchecks to access netlink data"

changes/61/628161/12
Zuul 3 years ago committed by Gerrit Code Review
parent
commit
dcc6c9bcad
  1. 5
      docker/services/neutron-dhcp.yaml
  2. 5
      docker/services/neutron-l3.yaml
  3. 5
      docker/services/neutron-metadata.yaml
  4. 5
      docker/services/neutron-ovs-agent.yaml
  5. 9
      docker/services/neutron-sriov-agent.yaml

5
docker/services/neutron-dhcp.yaml

@ -264,6 +264,11 @@ outputs:
path: /var/lib/neutron
state: directory
setype: svirt_sandbox_file_t
- - name: enable virt_sandbox_use_netlink for healtcheck
seboolean:
name: virt_sandbox_use_netlink
persistent: yes
state: yes
upgrade_tasks: []
fast_forward_upgrade_tasks:
- when:

5
docker/services/neutron-l3.yaml

@ -261,6 +261,11 @@ outputs:
path: /var/lib/neutron
state: directory
setype: svirt_sandbox_file_t
- - name: enable virt_sandbox_use_netlink for healtcheck
seboolean:
name: virt_sandbox_use_netlink
persistent: yes
state: yes
upgrade_tasks: []
fast_forward_upgrade_tasks:
- when:

5
docker/services/neutron-metadata.yaml

@ -143,6 +143,11 @@ outputs:
path: /var/lib/neutron
state: directory
setype: svirt_sandbox_file_t
- - name: enable virt_sandbox_use_netlink for healtcheck
seboolean:
name: virt_sandbox_use_netlink
persistent: yes
state: yes
upgrade_tasks: []
post_upgrade_tasks:
- when: step|int == 1

5
docker/services/neutron-ovs-agent.yaml

@ -225,6 +225,11 @@ outputs:
service:
name: neutron-cleanup
enabled: yes
- name: enable virt_sandbox_use_netlink for healtcheck
seboolean:
name: virt_sandbox_use_netlink
persistent: yes
state: yes
upgrade_tasks:
- when: step|int == 3
block:

9
docker/services/neutron-sriov-agent.yaml

@ -118,7 +118,14 @@ outputs:
- /sys/class/net:/sys/class/net:rw
environment:
- KOLLA_CONFIG_STRATEGY=COPY_ALWAYS
host_prep_tasks: {get_attr: [NeutronLogging, host_prep_tasks]}
host_prep_tasks:
list_concat:
- {get_attr: [NeutronLogging, host_prep_tasks]}
- - name: enable virt_sandbox_use_netlink for healtcheck
seboolean:
name: virt_sandbox_use_netlink
persistent: yes
state: yes
metadata_settings:
get_attr: [NeutronSriovAgentBase, role_data, metadata_settings]
upgrade_tasks: []

Loading…
Cancel
Save