From cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Fri, 28 Aug 2015 12:16:53 +0000
Subject: Move docker_templates to docker dir

Updated build.py to reflect this change.
Deprecate --template option and make it a noop.

Change-Id: I7cd98d1ee684a4c64984a49597159868152683b2
Partially-Implements: blueprint remove-docker-dir
---
 docker/swift/swift-object-replicator/Dockerfile.j2     |  9 +++++++++
 .../swift/swift-object-replicator/config-external.sh   | 18 ++++++++++++++++++
 docker/swift/swift-object-replicator/start.sh          | 16 ++++++++++++++++
 3 files changed, 43 insertions(+)
 create mode 100644 docker/swift/swift-object-replicator/Dockerfile.j2
 create mode 100644 docker/swift/swift-object-replicator/config-external.sh
 create mode 100755 docker/swift/swift-object-replicator/start.sh

(limited to 'docker/swift/swift-object-replicator')

diff --git a/docker/swift/swift-object-replicator/Dockerfile.j2 b/docker/swift/swift-object-replicator/Dockerfile.j2
new file mode 100644
index 000000000..ab8a7adee
--- /dev/null
+++ b/docker/swift/swift-object-replicator/Dockerfile.j2
@@ -0,0 +1,9 @@
+FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-object-base:{{ tag }}
+MAINTAINER Kolla Project (https://launchpad.net.kolla)
+
+COPY start.sh /
+COPY config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
+
+{{ include_footer }}
diff --git a/docker/swift/swift-object-replicator/config-external.sh b/docker/swift/swift-object-replicator/config-external.sh
new file mode 100644
index 000000000..0fa02e985
--- /dev/null
+++ b/docker/swift/swift-object-replicator/config-external.sh
@@ -0,0 +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 "$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/swift/swift-object-replicator/start.sh b/docker/swift/swift-object-replicator/start.sh
new file mode 100755
index 000000000..203f8864d
--- /dev/null
+++ b/docker/swift/swift-object-replicator/start.sh
@@ -0,0 +1,16 @@
+#!/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
-- 
cgit v1.2.3