From b11321cedcfca8c394eefffae9589eba9b470fa2 Mon Sep 17 00:00:00 2001
From: "xiabing.yao" <yao.xiabing@99cloud.net>
Date: Thu, 6 Aug 2015 17:32:56 +0800
Subject: update config-external.sh in galera,keystone,rabbitmq,swift

Use variables like SOURCE,TARGET in config-external.sh, so
it will easy to modify in future.

Closes-Bug: #1485710

Change-Id: I3880a2cbca8a80d36e84a797fcfb943e43b88bd5
---
 docker/common/rabbitmq/config-external.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'docker/common/rabbitmq')

diff --git a/docker/common/rabbitmq/config-external.sh b/docker/common/rabbitmq/config-external.sh
index 40abd6156..33810d621 100644
--- a/docker/common/rabbitmq/config-external.sh
+++ b/docker/common/rabbitmq/config-external.sh
@@ -1,14 +1,19 @@
 #!/bin/bash
+SOURCE_CONFIG="/opt/kolla/rabbitmq/rabbitmq.config"
+TARGET_CONFIG="/etc/rabbitmq/rabbitmq.config"
+SOURCE_ENV="/opt/kolla/rabbitmq/rabbitmq-env.conf"
+TARGET_ENV="/etc/rabbitmq/rabbitmq-env.conf"
+OWNER="rabbitmq"
 
 # Cluster configuration
-if [[ -f /opt/kolla/rabbitmq/rabbitmq.config ]]; then
-    cp -af /opt/kolla/rabbitmq/rabbitmq.config /etc/rabbitmq/rabbitmq.config
-    chown rabbitmq: /etc/rabbitmq/rabbitmq.config
-    chmod 0600 /etc/rabbitmq/rabbitmq.config
+if [[ -f "$SOURCE_CONFIG" ]]; then
+    cp -af $SOURCE_CONFIG $TARGET_CONFIG
+    chown ${OWNER}: $TARGET_CONFIG
+    chmod 0600 $TARGET_CONFIG
 fi
 
-if [[ -f /opt/kolla/rabbitmq/rabbitmq-env.conf ]]; then
-    cp -af /opt/kolla/rabbitmq/rabbitmq-env.conf /etc/rabbitmq/rabbitmq-env.conf
-    chown rabbitmq: /etc/rabbitmq/rabbitmq-env.conf
-    chmod 0600 /etc/rabbitmq/rabbitmq-env.conf
+if [[ -f "$SOURCE_ENV" ]]; then
+    cp -af $SOURCE_ENV $TARGET_ENV
+    chown ${OWNER}: $TARGET_ENV
+    chmod 0600 $TARGET_ENV
 fi
-- 
cgit v1.2.3