openstack/kolla-ansible
Code Issues Proposed changes

Merge "Add /run/netns bindmount to Neutron containers" into stable/train

Browse Source
This commit is contained in:
Zuul 2020-02-28 18:53:48 +00:00 committed by Gerrit Code Review
commit 62f44ad51d
2 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/roles/neutron/defaults/main.yml
View File

@ -248,6 +248,7 @@ neutron_dhcp_agent_default_volumes:
- "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro" - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "/run/netns:/run/netns:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/neutron/neutron:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/neutron' if neutron_dev_mode | bool else '' }}" - "{{ kolla_dev_repos_directory ~ '/neutron/neutron:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/neutron' if neutron_dev_mode | bool else '' }}"
neutron_l3_agent_default_volumes: neutron_l3_agent_default_volumes:
@ -255,6 +256,7 @@ neutron_l3_agent_default_volumes:
- "/etc/localtime:/etc/localtime:ro" - "/etc/localtime:/etc/localtime:ro"
- "/lib/modules:/lib/modules:ro" - "/lib/modules:/lib/modules:ro"
- "neutron_metadata_socket:/var/lib/neutron/kolla/" - "neutron_metadata_socket:/var/lib/neutron/kolla/"
- "/run/netns:/run/netns:shared"
- "kolla_logs:/var/log/kolla/" - "kolla_logs:/var/log/kolla/"
- "{{ kolla_dev_repos_directory ~ '/neutron/neutron:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/neutron' if neutron_dev_mode | bool else '' }}" - "{{ kolla_dev_repos_directory ~ '/neutron/neutron:/var/lib/kolla/venv/lib/python' ~ distro_python_version ~ '/site-packages/neutron' if neutron_dev_mode | bool else '' }}"
neutron_sriov_agent_default_volumes: neutron_sriov_agent_default_volumes:

3
releasenotes/notes/bug-1861792-a44a31693b0c786f.yaml
View File

@ -2,4 +2,5 @@
fixes: fixes:
- | - |
Remove /run bind mounts in Neutron services causing dbus host-level Remove /run bind mounts in Neutron services causing dbus host-level
errors `LP# 1861792 <https://launchpad.net/bugs/1861792>`. errors and add /run/netns for neutron-dhcp-agent and neutron-l3-agent.
`LP# 1861792 <https://launchpad.net/bugs/1861792>`__