aboutsummaryrefslogtreecommitdiff
path: root/docker/common/swift/swift-object-replicator
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-27 19:03:59 -0700
committerSteven Dake <stdake@cisco.com>2015-08-28 00:50:30 -0700
commit26d0d8d2fbb5f52d0b5a35e0627fb0a61f529852 (patch)
tree43a7f4f6bc11ec71d761000f0155e6b64e3649d1 /docker/common/swift/swift-object-replicator
parenteef32f0353d5cee9b4bb876767aab5c8298375eb (diff)
downloadkolla-26d0d8d2fbb5f52d0b5a35e0627fb0a61f529852.tar.gz
kolla-26d0d8d2fbb5f52d0b5a35e0627fb0a61f529852.zip
Move scripts for swift to docker_templates
Change-Id: Ia1bcc94fd58bbfec980bfacbd7acb885a17f9056 Partially-Implements: blueprint remove-docker-dir
Diffstat (limited to 'docker/common/swift/swift-object-replicator')
-rw-r--r--docker/common/swift/swift-object-replicator/config-external.sh18
-rwxr-xr-xdocker/common/swift/swift-object-replicator/start.sh16
2 files changed, 0 insertions, 34 deletions
diff --git a/docker/common/swift/swift-object-replicator/config-external.sh b/docker/common/swift/swift-object-replicator/config-external.sh
deleted file mode 100644
index 0fa02e985..000000000
--- a/docker/common/swift/swift-object-replicator/config-external.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/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 "$SOURCE" ]]; then
- cp $SOURCE $TARGET
- chown ${OWNER}: $TARGET
- chmod 0640 $TARGET
-fi
-
-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-replicator/start.sh b/docker/common/swift/swift-object-replicator/start.sh
deleted file mode 100755
index 203f8864d..000000000
--- a/docker/common/swift/swift-object-replicator/start.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/swift-object-replicator"
-ARGS="/etc/swift/object-server.conf --verbose"
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-source /opt/kolla/config-swift.sh
-
-# Execute config strategy
-set_configs
-
-exec $CMD $ARGS