Merge "remove set_configs"

15 files changed, 0 insertions, 60 deletions

diff --git a/docker/swift/swift-account-auditor/start.sh b/docker/swift/swift-account-auditor/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-account-auditor/start.sh
+++ b/docker/swift/swift-account-auditor/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-account-reaper/start.sh b/docker/swift/swift-account-reaper/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-account-reaper/start.sh
+++ b/docker/swift/swift-account-reaper/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-account-replicator/start.sh b/docker/swift/swift-account-replicator/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-account-replicator/start.sh
+++ b/docker/swift/swift-account-replicator/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-account-server/start.sh b/docker/swift/swift-account-server/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-account-server/start.sh
+++ b/docker/swift/swift-account-server/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-container-auditor/start.sh b/docker/swift/swift-container-auditor/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-container-auditor/start.sh
+++ b/docker/swift/swift-container-auditor/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-container-replicator/start.sh b/docker/swift/swift-container-replicator/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-container-replicator/start.sh
+++ b/docker/swift/swift-container-replicator/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-container-server/start.sh b/docker/swift/swift-container-server/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-container-server/start.sh
+++ b/docker/swift/swift-container-server/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-container-updater/start.sh b/docker/swift/swift-container-updater/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-container-updater/start.sh
+++ b/docker/swift/swift-container-updater/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-object-auditor/start.sh b/docker/swift/swift-object-auditor/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-object-auditor/start.sh
+++ b/docker/swift/swift-object-auditor/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-object-expirer/start.sh b/docker/swift/swift-object-expirer/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-object-expirer/start.sh
+++ b/docker/swift/swift-object-expirer/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-object-replicator/start.sh b/docker/swift/swift-object-replicator/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-object-replicator/start.sh
+++ b/docker/swift/swift-object-replicator/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-object-server/start.sh b/docker/swift/swift-object-server/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-object-server/start.sh
+++ b/docker/swift/swift-object-server/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-object-updater/start.sh b/docker/swift/swift-object-updater/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-object-updater/start.sh
+++ b/docker/swift/swift-object-updater/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-proxy-server/start.sh b/docker/swift/swift-proxy-server/start.sh
index 7adad007a..2fbfc3012 100755
--- a/docker/swift/swift-proxy-server/start.sh
+++ b/docker/swift/swift-proxy-server/start.sh
@@ -5,8 +5,4 @@ set -o errexit
 source /opt/kolla/kolla-common.sh
 source /opt/kolla/config-swift.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD
diff --git a/docker/swift/swift-rsyncd/start.sh b/docker/swift/swift-rsyncd/start.sh
index d43e03581..a083e7bac 100755
--- a/docker/swift/swift-rsyncd/start.sh
+++ b/docker/swift/swift-rsyncd/start.sh
@@ -4,8 +4,4 @@ set -o errexit
 # Loading common functions.
 source /opt/kolla/kolla-common.sh
 
-# Generate run command
-python /opt/kolla/set_configs.py
-CMD=$(cat /run_command)
-
 exec $CMD