From 321a6e54842febcabbb1ca19f52bd40187ca75ab Mon Sep 17 00:00:00 2001
From: Bertrand Lallau <bertrand.lallau@thalesgroup.com>
Date: Thu, 6 Apr 2017 15:02:15 +0200
Subject: [PATCH] Cleanup /run/netns host directory volume mount

"/run/:/run/:shared" is previously declare as "mounted" in container,
hence "/run/netns/:/run/netns/:shared" directory volume mount is not
required and must be removed.

Related-Bug: #1683584
Change-Id: Ia7032843c493e8a883edd2f4ec12e0fdefc823a3
---
 ansible/roles/neutron/defaults/main.yml | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/ansible/roles/neutron/defaults/main.yml b/ansible/roles/neutron/defaults/main.yml
index 514ebdaf8b..e91e407f56 100644
--- a/ansible/roles/neutron/defaults/main.yml
+++ b/ansible/roles/neutron/defaults/main.yml
@@ -104,7 +104,6 @@ neutron_services:
       - "{{ node_config_directory }}/neutron-dhcp-agent/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/run/:/run/:shared"
-      - "/run/netns/:/run/netns/:shared"
       - "neutron_metadata_socket:/var/lib/neutron/kolla/"
       - "kolla_logs:/var/log/kolla/"
   neutron-l3-agent:
@@ -122,7 +121,6 @@ neutron_services:
       - "{{ node_config_directory }}/neutron-l3-agent/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
       - "neutron_metadata_socket:/var/lib/neutron/kolla/"
       - "kolla_logs:/var/log/kolla/"
   neutron-lbaas-agent:
@@ -136,7 +134,6 @@ neutron_services:
       - "{{ node_config_directory }}/neutron-lbaas-agent/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
       - "kolla_logs:/var/log/kolla/"
   neutron-metadata-agent:
     container_name: "neutron_metadata_agent"
@@ -166,7 +163,6 @@ neutron_services:
       - "{{ node_config_directory }}/neutron-vpnaas-agent/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
       - "/lib/modules:/lib/modules:ro"
       - "kolla_logs:/var/log/kolla/"
   neutron-bgp-dragent:
@@ -180,7 +176,6 @@ neutron_services:
       - "{{ node_config_directory }}/neutron-bgp-dragent/:{{ container_config_directory }}/:ro"
       - "/etc/localtime:/etc/localtime:ro"
       - "/run:/run:shared"
-      - "/run/netns/:/run/netns/:shared"
       - "/lib/modules:/lib/modules:ro"
       - "kolla_logs:/var/log/kolla/"