Merge "Fix namespace regression for neutron"

This commit is contained in:
Jenkins 2015-11-18 02:14:16 +00:00 committed by Gerrit Code Review
commit 4cddefe7d7
2 changed files with 6 additions and 0 deletions

View File

@ -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 }}

View File

@ -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