diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-18 02:14:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-18 02:14:16 +0000 |
| commit | 4cddefe7d77166b3b328862821e392f87d55ba97 (patch) | |
| tree | b7350b6d13b75a8ae37183c3edaba8d6e87b2b58 /docker | |
| parent | b647535e338c4f38521cd81d861684998edb589f (diff) | |
| parent | baf9d93358f8fc79df9bb71f24dbc50b85860ea1 (diff) | |
| download | kolla-4cddefe7d77166b3b328862821e392f87d55ba97.tar.gz kolla-4cddefe7d77166b3b328862821e392f87d55ba97.zip | |
Merge "Fix namespace regression for neutron"
Diffstat (limited to 'docker')
| -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 |