openstack/kolla
Code Issues Proposed changes

Fix namespace regression for neutron

Browse Source 
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
This commit is contained in:
Sam Yaple 2015-11-12 17:05:31 +00:00
parent 55e4b54e23
commit baf9d93358
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
docker/neutron/neutron-agents/Dockerfile.j2
View File

@ -35,6 +35,9 @@ COPY config-sudoers.sh /var/lib/kolla/
COPY start.sh / COPY start.sh /
# We will remove this line in Docker 1.10 when namespace propogation works
VOLUME /run/netns
CMD ["/start.sh"] CMD ["/start.sh"]
{{ include_footer }} {{ include_footer }}

3
docker/neutron/neutron-agents/start.sh
View File

@ -1,6 +1,9 @@
#!/bin/bash #!/bin/bash
set -o errexit 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 # Processing /var/lib/kolla/config_files/config.json
python /usr/local/bin/kolla_set_configs python /usr/local/bin/kolla_set_configs