aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSam Yaple <sam@yaple.net>2015-06-27 12:07:46 +0000
committerSam Yaple <sam@yaple.net>2015-06-27 16:39:34 +0000
commit62e02fdbf4a4f714d008943c4e5c8512a93807ed (patch)
treed511e0543c6187d38673bcedb257889180025c8d /tools
parenta48900bc1c13fcca782261a9b3015a3676791c53 (diff)
downloadkolla-62e02fdbf4a4f714d008943c4e5c8512a93807ed.tar.gz
kolla-62e02fdbf4a4f714d008943c4e5c8512a93807ed.zip
Partially revert thin neutron containers
Due to a revert in the Docker code, thin neutron containers do not work at this time. The neutron plugin agents do not need to exist in the same container as the other agents however. This allows for using either linuxbridge or openvswitch The docker commit that did the revert: https://github.com/docker/docker/commit/ff770d33cdee5ab4dc0bdeb06dcfea49aa72ab8e Closes-Bug: 1469307 Change-Id: Idf79c31c74c34b93f5a9bac49730aca49bbdb861
Diffstat (limited to 'tools')
-rwxr-xr-xtools/kolla4
1 files changed, 1 insertions, 3 deletions
diff --git a/tools/kolla b/tools/kolla
index 9235c5677..62193d9d9 100755
--- a/tools/kolla
+++ b/tools/kolla
@@ -39,10 +39,8 @@ function process_all {
# Defaulting to neutron
process nova-compute
process neutron-server
- process neutron-dhcp-agent
- process neutron-l3-agent
- process neutron-metadata-agent
process neutron-linuxbridge-agent
+ process neutron-agents
fi
process heat-api-engine
process magnum-api-conductor