diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-10 12:44:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-10 12:44:16 +0000 |
| commit | 3b985b2c5617903a097e6c1430d47833a83290c1 (patch) | |
| tree | f549a57084f50719621fa872ef36db456ef1cc4b /docker | |
| parent | a2eef1e54ca9ef543a1b6872ca2b57f7d3a9e7d6 (diff) | |
| parent | 128e80d0a061806da1b1ddb33fc06cbac27806dd (diff) | |
| download | kolla-3b985b2c5617903a097e6c1430d47833a83290c1.tar.gz kolla-3b985b2c5617903a097e6c1430d47833a83290c1.zip | |
Merge "Remove config-internal from neutron agent start files"
Diffstat (limited to 'docker')
| -rwxr-xr-x | docker/common/neutron/neutron-dhcp-agent/start.sh | 4 | ||||
| -rwxr-xr-x | docker/common/neutron/neutron-l3-agent/start.sh | 4 | ||||
| -rwxr-xr-x | docker/common/neutron/neutron-metadata-agent/start.sh | 4 |
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 ;; |