From 128e80d0a061806da1b1ddb33fc06cbac27806dd Mon Sep 17 00:00:00 2001 From: Steven Dake Date: Sun, 9 Aug 2015 13:00:55 -0700 Subject: [PATCH] Remove config-internal from neutron agent start files Change-Id: Ie9b04c5e8dd4d2058172120d81c229ce747f5d27 Partially-Implements: blueprint remove-config-internal --- docker/common/neutron/neutron-dhcp-agent/start.sh | 4 ---- docker/common/neutron/neutron-l3-agent/start.sh | 4 ---- docker/common/neutron/neutron-metadata-agent/start.sh | 4 ---- 3 files changed, 12 deletions(-) diff --git a/docker/common/neutron/neutron-dhcp-agent/start.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh index 7b88cd9606..7b64f87aa6 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 60b2f22846..e0a17e47a6 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 5b222fa4ce..09a7329c74 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 ;;