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/keystone/config-external.sh | 21 +++++++++++++--------
 1 file changed, 13 insertions(+), 8 deletions(-)

(limited to 'docker/common/keystone')

diff --git a/docker/common/keystone/config-external.sh b/docker/common/keystone/config-external.sh
index 54df0f3a1..9742e3b12 100644
--- a/docker/common/keystone/config-external.sh
+++ b/docker/common/keystone/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/keystone/keystone.conf"
+TARGET="/etc/keystone/keystone.conf"
+SOURCE_WSGI="/opt/kolla/keystone/wsgi-keystone.conf"
+TARGET_WSGI="/etc/httpd/conf.d/wsgi-keystone.conf"
+OWNER="keystone"
 
-if [[ -f /opt/kolla/keystone/wsgi-keystone.conf ]]; then
-    cp /opt/kolla/keystone/wsgi-keystone.conf /etc/httpd/conf.d/
-    chown root:keystone /etc/httpd/conf.d/wsgi-keystone.conf
-    chmod 0644 /etc/httpd/conf.d/wsgi-keystone.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0644 $TARGET
 fi
 
-if [[ -f /opt/kolla/keystone/keystone.conf ]]; then
-    cp /opt/kolla/keystone/keystone.conf /etc/keystone/keystone.conf
-    chown keystone: /etc/keystone/keystone.conf
-    chmod 0644 /etc/keystone/keystone.conf
+if [[ -f "$SOURCE_WSGI" ]]; then
+    cp $SOURCE_WSGI $TARGET_WSGI
+    chown ${OWNER}: $TARGET_WSGI
+    chmod 0644 $TARGET_WSGI
 fi
-- 
cgit v1.2.3