diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-31 05:25:15 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-31 05:25:15 +0000 |
| commit | c940e156e390a772f4ecfeb7c627825faaa8150d (patch) | |
| tree | 8014d2067a1f06faa7bde92e9925d0fd49081d06 /docker | |
| parent | 45f625a73ea67b31460fdb9da74ba8d619383783 (diff) | |
| parent | f2b92929732f10dfa6f1eaeb742d775824a8a840 (diff) | |
| download | kolla-c940e156e390a772f4ecfeb7c627825faaa8150d.tar.gz kolla-c940e156e390a772f4ecfeb7c627825faaa8150d.zip | |
Merge "Fix KOLLA_CONFIG_STRATEGY in neutron agents"
Diffstat (limited to 'docker')
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 |