diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-28 04:29:22 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-28 04:29:22 +0000 |
| commit | 399117b27ab35d17fd216a2ae2f391336b47a6a9 (patch) | |
| tree | e1df7d24cfa93bc07aedf6e64d61ff8ea5032aa3 /docker | |
| parent | 641fa399bab3b1d18906933a8fb9f4e68da9c7fb (diff) | |
| download | kolla-399117b27ab35d17fd216a2ae2f391336b47a6a9.tar.gz kolla-399117b27ab35d17fd216a2ae2f391336b47a6a9.zip | |
Fix neutron-agents regression
Change-Id: I01220077d8d25db5f69802ad27e745d90826d69b
Closes-Bug: #1489664
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, 6 insertions, 6 deletions
diff --git a/docker/common/neutron/neutron-dhcp-agent/start.sh b/docker/common/neutron/neutron-dhcp-agent/start.sh index 7b64f87aa..9186a5c90 100755 --- a/docker/common/neutron/neutron-dhcp-agent/start.sh +++ b/docker/common/neutron/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/common/neutron/neutron-l3-agent/start.sh b/docker/common/neutron/neutron-l3-agent/start.sh index e0a17e47a..2a0f18b62 100755 --- a/docker/common/neutron/neutron-l3-agent/start.sh +++ b/docker/common/neutron/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/common/neutron/neutron-metadata-agent/start.sh b/docker/common/neutron/neutron-metadata-agent/start.sh index 09a7329c7..04c37159a 100755 --- a/docker/common/neutron/neutron-metadata-agent/start.sh +++ b/docker/common/neutron/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 |