diff options
| author | Sam Yaple <sam@yaple.net> | 2015-11-12 17:05:31 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-11-16 20:56:39 +0000 |
| commit | baf9d93358f8fc79df9bb71f24dbc50b85860ea1 (patch) | |
| tree | d44bc75e64906986d90c6f42f6a9672bea85fad9 | |
| parent | 55e4b54e23e96f0baae0fc49817a25152843d36c (diff) | |
| download | kolla-baf9d93358f8fc79df9bb71f24dbc50b85860ea1.tar.gz kolla-baf9d93358f8fc79df9bb71f24dbc50b85860ea1.zip | |
Fix namespace regression for neutron
Due the to way network namespaces work, they will not survive a
container restart. This is not an issue related to Kolla or Neutron
but rather an issue with how network namespaces work.
This is putting back into place a workaround that was in correctly
removed in the past. We simply cleanup the namespace cruft when the
neutron-agents container restarts thus avoiding this issue.
Change-Id: Ic16f2f766b4fa46347ea14a1ece5a4653c69d779
Closes-Bug: #1511216
| -rw-r--r-- | docker/neutron/neutron-agents/Dockerfile.j2 | 3 | ||||
| -rwxr-xr-x | docker/neutron/neutron-agents/start.sh | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/docker/neutron/neutron-agents/Dockerfile.j2 b/docker/neutron/neutron-agents/Dockerfile.j2 index 28b73f1b2..159f39c5e 100644 --- a/docker/neutron/neutron-agents/Dockerfile.j2 +++ b/docker/neutron/neutron-agents/Dockerfile.j2 @@ -35,6 +35,9 @@ COPY config-sudoers.sh /var/lib/kolla/ COPY start.sh / +# We will remove this line in Docker 1.10 when namespace propogation works +VOLUME /run/netns + CMD ["/start.sh"] {{ include_footer }} diff --git a/docker/neutron/neutron-agents/start.sh b/docker/neutron/neutron-agents/start.sh index e15650659..fb1732277 100755 --- a/docker/neutron/neutron-agents/start.sh +++ b/docker/neutron/neutron-agents/start.sh @@ -1,6 +1,9 @@ #!/bin/bash set -o errexit +# We must remove all of the stale namespaces if they exist +rm -f /run/netns/* + # Processing /var/lib/kolla/config_files/config.json python /usr/local/bin/kolla_set_configs |