aboutsummaryrefslogtreecommitdiff
path: root/docker/common
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-09 13:00:55 -0700
committerSteven Dake <stdake@cisco.com>2015-08-09 13:00:55 -0700
commit128e80d0a061806da1b1ddb33fc06cbac27806dd (patch)
tree7f48ef5eaaa24cbe313f7d0765db5ce12bbdc11a /docker/common
parentdf9c0ee8ef2303d19ed6c9f27d4e29b60eba026e (diff)
downloadkolla-128e80d0a061806da1b1ddb33fc06cbac27806dd.tar.gz
kolla-128e80d0a061806da1b1ddb33fc06cbac27806dd.zip
Remove config-internal from neutron agent start files
Change-Id: Ie9b04c5e8dd4d2058172120d81c229ce747f5d27 Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/common')
-rwxr-xr-xdocker/common/neutron/neutron-dhcp-agent/start.sh4
-rwxr-xr-xdocker/common/neutron/neutron-l3-agent/start.sh4
-rwxr-xr-xdocker/common/neutron/neutron-metadata-agent/start.sh4
3 files changed, 0 insertions, 12 deletions
diff --git a/docker/common/neutron/neutron-dhcp-agent/start.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh
index 7b88cd960..7b64f87aa 100755
--- a/docker/common/neutron/neutron-dhcp-agent/start.sh
+++ b/docker/common/neutron/neutron-dhcp-agent/start.sh
@@ -12,10 +12,6 @@ source /opt/kolla/config-sudoers.sh
# this one.
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
- CONFIG_INTERNAL)
- # exec is intentional to preserve existing behaviour
- exec /opt/kolla/neutron-dhcp-agent/config-internal.sh
- ;;
CONFIG_EXTERNAL_COPY_ALWAYS)
source /opt/kolla/neutron-dhcp-agent/config-external.sh
;;
diff --git a/docker/common/neutron/neutron-l3-agent/start.sh b/docker/common/neutron/neutron-l3-agent/start.sh
index 60b2f2284..e0a17e47a 100755
--- a/docker/common/neutron/neutron-l3-agent/start.sh
+++ b/docker/common/neutron/neutron-l3-agent/start.sh
@@ -12,10 +12,6 @@ source /opt/kolla/config-sudoers.sh
# this one.
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
- CONFIG_INTERNAL)
- # exec is intentional to preserve existing behaviour
- exec /opt/kolla/neutron-l3-agent/config-internal.sh
- ;;
CONFIG_EXTERNAL_COPY_ALWAYS)
source /opt/kolla/neutron-l3-agent/config-external.sh
;;
diff --git a/docker/common/neutron/neutron-metadata-agent/start.sh b/docker/common/neutron/neutron-metadata-agent/start.sh
index 5b222fa4c..09a7329c7 100755
--- a/docker/common/neutron/neutron-metadata-agent/start.sh
+++ b/docker/common/neutron/neutron-metadata-agent/start.sh
@@ -12,10 +12,6 @@ source /opt/kolla/config-sudoers.sh
# this one.
set_configs() {
case $KOLLA_CONFIG_STRATEGY in
- CONFIG_INTERNAL)
- # exec is intentional to preserve existing behaviour
- exec /opt/kolla/neutron-metadata-agent/config-internal.sh
- ;;
CONFIG_EXTERNAL_COPY_ALWAYS)
source /opt/kolla/neutron-metadata-agent/config-external.sh
;;