From 61a59e015f91041e01e51310229ff91c2cac730d Mon Sep 17 00:00:00 2001 From: Michal Nasiadka Date: Wed, 26 Feb 2020 16:00:47 +0100 Subject: [PATCH] Add /run/netns bindmount to Neutron containers Closes-Bug: #1864856 Change-Id: I725eeb18a22b3fa7838f16761d19f7e699ab5e82 --- ansible/roles/neutron/defaults/main.yml | 2 ++ releasenotes/notes/bug-1861792-a44a31693b0c786f.yaml | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml index 66309fe3dc..fad3985828 100644 --- a/ansible/roles/neutron/defaults/main.yml +++ b/ansible/roles/neutron/defaults/main.yml @@ -245,6 +245,7 @@ neutron_dhcp_agent_default_volumes: - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro" - "/etc/localtime:/etc/localtime:ro" - "neutron_metadata_socket:/var/lib/neutron/kolla/" + - "/run/netns:/run/netns:shared" - "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 '' }}" neutron_l3_agent_default_volumes: @@ -252,6 +253,7 @@ neutron_l3_agent_default_volumes: - "/etc/localtime:/etc/localtime:ro" - "/lib/modules:/lib/modules:ro" - "neutron_metadata_socket:/var/lib/neutron/kolla/" + - "/run/netns:/run/netns:shared" - "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 '' }}" neutron_sriov_agent_default_volumes: diff --git a/releasenotes/notes/bug-1861792-a44a31693b0c786f.yaml b/releasenotes/notes/bug-1861792-a44a31693b0c786f.yaml index cff5fee560..1d91ca3f93 100644 --- a/releasenotes/notes/bug-1861792-a44a31693b0c786f.yaml +++ b/releasenotes/notes/bug-1861792-a44a31693b0c786f.yaml @@ -2,4 +2,5 @@ fixes: - | Remove /run bind mounts in Neutron services causing dbus host-level - errors `LP# 1861792 `. + errors and add /run/netns for neutron-dhcp-agent and neutron-l3-agent. + `LP# 1861792 `__