diff options
| author | Sam Yaple <sam@yaple.net> | 2015-08-28 12:16:53 +0000 |
|---|---|---|
| committer | Sam Yaple <sam@yaple.net> | 2015-08-28 13:33:50 +0000 |
| commit | cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2 (patch) | |
| tree | 2e4256b6b7b8339da11b1d17250378596e61605b /docker_templates/swift/swift-object-server | |
| parent | 3b5380ade021c9884551f427441cbfc0122eb0f0 (diff) | |
| download | kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.tar.gz kolla-cbd42ca6e90cca2ff4b84f5e4e46224e6455e8b2.zip | |
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
Diffstat (limited to 'docker_templates/swift/swift-object-server')
3 files changed, 0 insertions, 52 deletions
diff --git a/docker_templates/swift/swift-object-server/Dockerfile.j2 b/docker_templates/swift/swift-object-server/Dockerfile.j2 deleted file mode 100644 index ab8a7adee..000000000 --- a/docker_templates/swift/swift-object-server/Dockerfile.j2 +++ /dev/null @@ -1,9 +0,0 @@ -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_templates/swift/swift-object-server/config-external.sh b/docker_templates/swift/swift-object-server/config-external.sh deleted file mode 100644 index a3fb1a2cc..000000000 --- a/docker_templates/swift/swift-object-server/config-external.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -OWNER="swift" - -if [[ -f "/opt/kolla/swift/swift.conf" ]]; then - cp /opt/kolla/swift/swift.conf /etc/swift/swift.conf - chown ${OWNER}: /etc/swift/swift.conf - chmod 0640 /etc/swift/swift.conf -fi - -if [[ -f "/opt/kolla/swift/object.ring.gz" ]]; then - cp /opt/kolla/swift/object.ring.gz /etc/swift/object.ring.gz - chown ${OWNER}: /etc/swift/object.ring.gz - chmod 0640 /etc/swift/object.ring.gz -fi - -if [[ -f "/opt/kolla/swift/container.ring.gz" ]]; then - cp /opt/kolla/swift/container.ring.gz /etc/swift/container.ring.gz - chown ${OWNER}: /etc/swift/container.ring.gz - chmod 0640 /etc/swift/container.ring.gz -fi - -if [[ -f "/opt/kolla/swift-object-server/object-server.conf" ]]; then - cp /opt/kolla/swift-object-server/object-server.conf /etc/swift/object-server.conf - chown ${OWNER}: /etc/swift/object-server.conf - chmod 0640 /etc/swift/object-server.conf -fi diff --git a/docker_templates/swift/swift-object-server/start.sh b/docker_templates/swift/swift-object-server/start.sh deleted file mode 100755 index f2a32b4d3..000000000 --- a/docker_templates/swift/swift-object-server/start.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -set -o errexit - -CMD="/usr/bin/swift-object-server" -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 |