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
---
 .../swift/swift-account-server/config-external.sh   | 21 +++++++++++++--------
 .../swift/swift-container-server/config-external.sh | 21 +++++++++++++--------
 .../swift/swift-object-auditor/config-external.sh   | 21 +++++++++++++--------
 .../swift/swift-object-expirer/config-external.sh   | 21 +++++++++++++--------
 .../swift-object-replicator/config-external.sh      | 21 +++++++++++++--------
 .../swift/swift-object-server/config-external.sh    | 21 +++++++++++++--------
 .../swift/swift-object-updater/config-external.sh   | 21 +++++++++++++--------
 7 files changed, 91 insertions(+), 56 deletions(-)

(limited to 'docker/common/swift')

diff --git a/docker/common/swift/swift-account-server/config-external.sh b/docker/common/swift/swift-account-server/config-external.sh
index fe20dcb92..613fd30f0 100644
--- a/docker/common/swift/swift-account-server/config-external.sh
+++ b/docker/common/swift/swift-account-server/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_ACCOUNT_SERVER="/opt/kolla/swift/account-server.conf"
+TARGET_ACCOUNT_SERVER="/etc/swift/account-server.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /etc/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/account-server.conf ]]; then
-    cp /opt/kolla/swift/account-server.conf /etc/swift/
-    chown swift: /etc/swift/account-server.conf
-    chmod 0640 /etc/swift/account-server.conf
+if [[ -f "$SOURCE_ACCOUNT_SERVER" ]]; then
+    cp $SOURCE_ACCOUNT_SERVER $TARGET_ACCOUNT_SERVER
+    chown ${OWNER}: $TARGET_ACCOUNT_SERVER
+    chmod 0640 $TARGET_ACCOUNT_SERVER
 fi
diff --git a/docker/common/swift/swift-container-server/config-external.sh b/docker/common/swift/swift-container-server/config-external.sh
index 6f4186e0f..93f696349 100644
--- a/docker/common/swift/swift-container-server/config-external.sh
+++ b/docker/common/swift/swift-container-server/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_CONTAINER_SERVER="/opt/kolla/swift/container-server.conf"
+TARGET_CONTAINER_SERVER="/etc/swift/container-server.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /etc/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/container-server.conf ]]; then
-    cp /opt/kolla/swift/container-server.conf /etc/swift/
-    chown swift: /etc/swift/container-server.conf
-    chmod 0640 /etc/swift/container-server.conf
+if [[ -f "$SOURCE_CONTAINER_SERVER" ]]; then
+    cp $SOURCE_CONTAINER_SERVER $TARGET_CONTAINER_SERVER
+    chown ${OWNER}: $TARGET_CONTAINER_SERVER
+    chmod 0640 $TARGET_CONTAINER_SERVER
 fi
diff --git a/docker/common/swift/swift-object-auditor/config-external.sh b/docker/common/swift/swift-object-auditor/config-external.sh
index f06689532..0fa02e985 100644
--- a/docker/common/swift/swift-object-auditor/config-external.sh
+++ b/docker/common/swift/swift-object-auditor/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_OBJECT_SERVER="/opt/kolla/swift/object-server.conf"
+TARGET_OBJECT_SERVER="/etc/swift/object-server.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /etc/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/object-server.conf ]]; then
-    cp /opt/kolla/swift/object-server.conf /etc/swift/
-    chown swift: /opt/kolla/swift/object-server.conf
-    chmod 0640 /etc/swift/object-server.conf
+if [[ -f "$SOURCE_OBJECT_SERVER" ]]; then
+    cp $SOURCE_OBJECT_SERVER $TARGET_OBJECT_SERVER
+    chown ${OWNER}: $TARGET_OBJECT_SERVER
+    chmod 0640 $TARGET_OBJECT_SERVER
 fi
diff --git a/docker/common/swift/swift-object-expirer/config-external.sh b/docker/common/swift/swift-object-expirer/config-external.sh
index ca4b35499..ff2bcf9f5 100644
--- a/docker/common/swift/swift-object-expirer/config-external.sh
+++ b/docker/common/swift/swift-object-expirer/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_OBJECT_EXPIRER="/opt/kolla/swift/object-expirer.conf"
+TARGET_OBJECT_EXPIRER="/etc/swift/object-expirer.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /opt/kolla/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/object-expirer.conf ]]; then
-    cp /opt/kolla/swift/object-expirer.conf /etc/swift/
-    chown swift: /opt/kolla/swift/object-expirer.conf
-    chmod 0640 /etc/swift/object-expirer.conf
+if [[ -f "$SOURCE_OBJECT_EXPIRER" ]]; then
+    cp $SOURCE_OBJECT_EXPIRER $TARGET_OBJECT_EXPIRER
+    chown ${OWNER}: $TARGET_OBJECT_EXPIRER
+    chmod 0640 $TARGET_OBJECT_EXPIRER
 fi
diff --git a/docker/common/swift/swift-object-replicator/config-external.sh b/docker/common/swift/swift-object-replicator/config-external.sh
index fdf92592c..0fa02e985 100644
--- a/docker/common/swift/swift-object-replicator/config-external.sh
+++ b/docker/common/swift/swift-object-replicator/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_OBJECT_SERVER="/opt/kolla/swift/object-server.conf"
+TARGET_OBJECT_SERVER="/etc/swift/object-server.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /opt/kolla/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/object-server.conf ]]; then
-    cp /opt/kolla/swift/object-server.conf /etc/swift/
-    chown swift: /opt/kolla/swift/object-server.conf
-    chmod 0640 /etc/swift/object-server.conf
+if [[ -f "$SOURCE_OBJECT_SERVER" ]]; then
+    cp $SOURCE_OBJECT_SERVER $TARGET_OBJECT_SERVER
+    chown ${OWNER}: $TARGET_OBJECT_SERVER
+    chmod 0640 $TARGET_OBJECT_SERVER
 fi
diff --git a/docker/common/swift/swift-object-server/config-external.sh b/docker/common/swift/swift-object-server/config-external.sh
index fdf92592c..0fa02e985 100644
--- a/docker/common/swift/swift-object-server/config-external.sh
+++ b/docker/common/swift/swift-object-server/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_OBJECT_SERVER="/opt/kolla/swift/object-server.conf"
+TARGET_OBJECT_SERVER="/etc/swift/object-server.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /opt/kolla/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/object-server.conf ]]; then
-    cp /opt/kolla/swift/object-server.conf /etc/swift/
-    chown swift: /opt/kolla/swift/object-server.conf
-    chmod 0640 /etc/swift/object-server.conf
+if [[ -f "$SOURCE_OBJECT_SERVER" ]]; then
+    cp $SOURCE_OBJECT_SERVER $TARGET_OBJECT_SERVER
+    chown ${OWNER}: $TARGET_OBJECT_SERVER
+    chmod 0640 $TARGET_OBJECT_SERVER
 fi
diff --git a/docker/common/swift/swift-object-updater/config-external.sh b/docker/common/swift/swift-object-updater/config-external.sh
index ebd1ad9a9..0fa02e985 100644
--- a/docker/common/swift/swift-object-updater/config-external.sh
+++ b/docker/common/swift/swift-object-updater/config-external.sh
@@ -1,13 +1,18 @@
 #!/bin/bash
+SOURCE="/opt/kolla/swift/swift.conf"
+TARGET="/etc/swift/swift.conf"
+SOURCE_OBJECT_SERVER="/opt/kolla/swift/object-server.conf"
+TARGET_OBJECT_SERVER="/etc/swift/object-server.conf"
+OWNER="swift"
 
-if [[ -f /opt/kolla/swift/swift.conf ]]; then
-    cp /opt/kolla/swift/swift.conf /etc/swift/
-    chown swift: /etc/swift/swift.conf
-    chmod 0640 /etc/swift/swift.conf
+if [[ -f "$SOURCE" ]]; then
+    cp $SOURCE $TARGET
+    chown ${OWNER}: $TARGET
+    chmod 0640 $TARGET
 fi
 
-if [[ -f /opt/kolla/swift/object-server.conf ]]; then
-    cp /opt/kolla/swift/object-server.conf /etc/swift/
-    chown swift: /etc/swift/object-server.conf
-    chmod 0640 /etc/swift/object-server.conf
+if [[ -f "$SOURCE_OBJECT_SERVER" ]]; then
+    cp $SOURCE_OBJECT_SERVER $TARGET_OBJECT_SERVER
+    chown ${OWNER}: $TARGET_OBJECT_SERVER
+    chmod 0640 $TARGET_OBJECT_SERVER
 fi
-- 
cgit v1.2.3