diff options
| author | Steven Dake <stdake@cisco.com> | 2015-08-30 12:42:30 -0700 |
|---|---|---|
| committer | Steven Dake <stdake@cisco.com> | 2015-08-30 12:44:43 -0700 |
| commit | f2b92929732f10dfa6f1eaeb742d775824a8a840 (patch) | |
| tree | dbae87b48033160f8da3f05b0e5b3fa1076ff2a3 | |
| parent | 5f621a4fe900d41f7f11497cac21875da3280386 (diff) | |
| download | kolla-f2b92929732f10dfa6f1eaeb742d775824a8a840.tar.gz kolla-f2b92929732f10dfa6f1eaeb742d775824a8a840.zip | |
Fix KOLLA_CONFIG_STRATEGY in neutron agents
The change from:
I01220077d8d25db5f69802ad27e745d90826d69b
In some way was lost by the gerrit. This patch just basically
redoes that work so the neutron agents will work properly.
Change-Id: I92ac1b8601d145a0722b37eda937ee2baac7a7c5
Closes-Bug: #1489664
3 files changed, 6 insertions, 6 deletions
diff --git a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh index 7b64f87aa..9186a5c90 100755 --- a/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh @@ -12,10 +12,10 @@ source /opt/kolla/config-sudoers.sh # this one. set_configs() { case $KOLLA_CONFIG_STRATEGY in - CONFIG_EXTERNAL_COPY_ALWAYS) + COPY_ALWAYS) source /opt/kolla/neutron-dhcp-agent/config-external.sh ;; - CONFIG_EXTERNAL_COPY_ONCE) + COPY_ONCE) if [[ -f /configured-dhcp ]]; then echo 'INFO - Neutron-dhcp has already been configured; Refusing to copy new configs' return diff --git a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh index e0a17e47a..2a0f18b62 100755 --- a/docker/neutron/neutron-agents/neutron-l3-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-l3-agent/start.sh @@ -12,10 +12,10 @@ source /opt/kolla/config-sudoers.sh # this one. set_configs() { case $KOLLA_CONFIG_STRATEGY in - CONFIG_EXTERNAL_COPY_ALWAYS) + COPY_ALWAYS) source /opt/kolla/neutron-l3-agent/config-external.sh ;; - CONFIG_EXTERNAL_COPY_ONCE) + COPY_ONCE) if [[ -f /configured-l3 ]]; then echo 'INFO - Neutron-l3 has already been configured; Refusing to copy new configs' return diff --git a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh index 09a7329c7..04c37159a 100755 --- a/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh +++ b/docker/neutron/neutron-agents/neutron-metadata-agent/start.sh @@ -12,10 +12,10 @@ source /opt/kolla/config-sudoers.sh # this one. set_configs() { case $KOLLA_CONFIG_STRATEGY in - CONFIG_EXTERNAL_COPY_ALWAYS) + COPY_ALWAYS) source /opt/kolla/neutron-metadata-agent/config-external.sh ;; - CONFIG_EXTERNAL_COPY_ONCE) + COPY_ONCE) if [[ -f /configured-md ]]; then echo 'INFO - Neutron-metadata has already been configured; Refusing to copy new configs' return |