aboutsummaryrefslogtreecommitdiff
path: root/docker_templates/swift/swift-proxy-server
diff options
context:
space:
mode:
Diffstat (limited to 'docker_templates/swift/swift-proxy-server')
-rw-r--r--docker_templates/swift/swift-proxy-server/Dockerfile.j216
-rwxr-xr-xdocker_templates/swift/swift-proxy-server/config-external.sh33
-rwxr-xr-xdocker_templates/swift/swift-proxy-server/start.sh16
3 files changed, 0 insertions, 65 deletions
diff --git a/docker_templates/swift/swift-proxy-server/Dockerfile.j2 b/docker_templates/swift/swift-proxy-server/Dockerfile.j2
deleted file mode 100644
index 54d024f8b..000000000
--- a/docker_templates/swift/swift-proxy-server/Dockerfile.j2
+++ /dev/null
@@ -1,16 +0,0 @@
-FROM {{ namespace }}/{{ base_distro }}-{{ install_type }}-swift-base:{{ tag }}
-MAINTAINER Kolla Project (https://launchpad.net.kolla)
-
-{% if install_type == 'binary' %}
- {% if base_distro in ['centos', 'fedora', 'oraclelinux'] %}
-
-RUN yum -y install openstack-swift-proxy && yum clean all
-
- {% endif %}
-{% endif %}
-
-COPY ./start.sh /start.sh
-COPY config-external.sh /opt/kolla/
-CMD ["/start.sh"]
-
-{{ include_footer }}
diff --git a/docker_templates/swift/swift-proxy-server/config-external.sh b/docker_templates/swift/swift-proxy-server/config-external.sh
deleted file mode 100755
index 434cce7e5..000000000
--- a/docker_templates/swift/swift-proxy-server/config-external.sh
+++ /dev/null
@@ -1,33 +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/account.ring.gz" ]]; then
- cp /opt/kolla/swift/account.ring.gz /etc/swift/account.ring.gz
- chown ${OWNER}: /etc/swift/account.ring.gz
- chmod 0640 /etc/swift/account.ring.gz
-fi
-
-if [[ -f "/opt/kolla/swift-proxy-server/proxy-server.conf" ]]; then
- cp /opt/kolla/swift-proxy-server/proxy-server.conf /etc/swift/proxy-server.conf
- chown ${OWNER}: /etc/swift/proxy-server.conf
- chmod 0640 /etc/swift/proxy-server.conf
-fi
diff --git a/docker_templates/swift/swift-proxy-server/start.sh b/docker_templates/swift/swift-proxy-server/start.sh
deleted file mode 100755
index 99a142e52..000000000
--- a/docker_templates/swift/swift-proxy-server/start.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/bash
-
-set -o errexit
-
-CMD="/usr/bin/swift-proxy-server"
-ARGS="/etc/swift/proxy-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