From f2b92929732f10dfa6f1eaeb742d775824a8a840 Mon Sep 17 00:00:00 2001
From: Steven Dake <stdake@cisco.com>
Date: Sun, 30 Aug 2015 12:42:30 -0700
Subject: [PATCH] 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
---
docker/neutron/neutron-agents/neutron-dhcp-agent/start.sh | 4 ++--
docker/neutron/neutron-agents/neutron-l3-agent/start.sh | 4 ++--
docker/neutron/neutron-agents/neutron-metadata-agent/start.sh | 4 ++--
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 7b64f87aa6..9186a5c90d 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 e0a17e47a6..2a0f18b62c 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 09a7329c74..04c37159af 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
--
GitLab