Implement Swift Containers

Known bugs/TODOs at this time of this patch update:

https://bugs.launchpad.net/kolla/+bug/1477990
https://bugs.launchpad.net/kolla/+bug/1477993

Implements: Blueprint swift-container
Closes-bug: #1477992
Co-Authored-By: Paul Bourke <paul.bourke@oracle.com>
Change-Id: I031f88a7cd1867104fef12df6ab3ffcc06cb65d6

56 files changed, 102 insertions, 20 deletions

diff --git a/docker/centos/binary/swift/swift-account/Dockerfile b/docker/centos/binary/swift/swift-account-server/Dockerfile
index 4c407ea82..b60a267a8 100644
--- a/docker/centos/binary/swift/swift-account/Dockerfile
+++ b/docker/centos/binary/swift/swift-account-server/Dockerfile
@@ -1,8 +1,11 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /start.sh
+RUN yum -y install \
+        openstack-swift-account \
+    && yum clean all
 
+COPY start.sh /
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-account/build b/docker/centos/binary/swift/swift-account-server/build
index ec1913803..ec1913803 120000
--- a/docker/centos/binary/swift/swift-account/build
+++ b/docker/centos/binary/swift/swift-account-server/build
diff --git a/docker/centos/binary/swift/swift-account-server/config-external.sh b/docker/centos/binary/swift/swift-account-server/config-external.sh
new file mode 120000
index 000000000..93a15ca3b
--- /dev/null
+++ b/docker/centos/binary/swift/swift-account-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-account-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account-server/config-internal.sh b/docker/centos/binary/swift/swift-account-server/config-internal.sh
new file mode 120000
index 000000000..93174deb0
--- /dev/null
+++ b/docker/centos/binary/swift/swift-account-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-account-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account-server/start.sh b/docker/centos/binary/swift/swift-account-server/start.sh
new file mode 120000
index 000000000..acf6b18d7
--- /dev/null
+++ b/docker/centos/binary/swift/swift-account-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-account-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account/config-external.sh b/docker/centos/binary/swift/swift-account/config-external.sh
deleted file mode 120000
index e7c6637fe..000000000
--- a/docker/centos/binary/swift/swift-account/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-account/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account/config-internal.sh b/docker/centos/binary/swift/swift-account/config-internal.sh
deleted file mode 120000
index 48504d07e..000000000
--- a/docker/centos/binary/swift/swift-account/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-account/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-account/start.sh b/docker/centos/binary/swift/swift-account/start.sh
deleted file mode 120000
index f9e76aa5b..000000000
--- a/docker/centos/binary/swift/swift-account/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-account/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-base/Dockerfile b/docker/centos/binary/swift/swift-base/Dockerfile
index 59600a23d..d31f9ebf6 100644
--- a/docker/centos/binary/swift/swift-base/Dockerfile
+++ b/docker/centos/binary/swift/swift-base/Dockerfile
@@ -1,8 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-RUN yum -y install openstack-utils openstack-swift && yum clean all
+RUN yum -y install openstack-swift && yum clean all
+
+COPY config-swift.sh build-swift-ring.py /opt/kolla/
 
-# These will come after we sort out start time config
 RUN mkdir /opt/swift
-config-swift.sh /opt/swift/config-swift.sh
diff --git a/docker/centos/binary/swift/swift-base/build-swift-ring.py b/docker/centos/binary/swift/swift-base/build-swift-ring.py
new file mode 120000
index 000000000..325bf93c5
--- /dev/null
+++ b/docker/centos/binary/swift/swift-base/build-swift-ring.py
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-base/build-swift-ring.py
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-base/config-swift.sh b/docker/centos/binary/swift/swift-base/config-swift.sh
new file mode 120000
index 000000000..fb883f482
--- /dev/null
+++ b/docker/centos/binary/swift/swift-base/config-swift.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-base/config-swift.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container/Dockerfile b/docker/centos/binary/swift/swift-container-server/Dockerfile
index 4c407ea82..e88e1ebcc 100644
--- a/docker/centos/binary/swift/swift-container/Dockerfile
+++ b/docker/centos/binary/swift/swift-container-server/Dockerfile
@@ -1,8 +1,11 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /start.sh
+RUN yum -y install \
+        openstack-swift-container \
+    && yum clean all
 
+COPY start.sh /
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-container/build b/docker/centos/binary/swift/swift-container-server/build
index ec1913803..ec1913803 120000
--- a/docker/centos/binary/swift/swift-container/build
+++ b/docker/centos/binary/swift/swift-container-server/build
diff --git a/docker/centos/binary/swift/swift-container-server/config-external.sh b/docker/centos/binary/swift/swift-container-server/config-external.sh
new file mode 120000
index 000000000..8fa814ca7
--- /dev/null
+++ b/docker/centos/binary/swift/swift-container-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-container-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container-server/config-internal.sh b/docker/centos/binary/swift/swift-container-server/config-internal.sh
new file mode 120000
index 000000000..3b3c7fcdf
--- /dev/null
+++ b/docker/centos/binary/swift/swift-container-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-container-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container-server/start.sh b/docker/centos/binary/swift/swift-container-server/start.sh
new file mode 120000
index 000000000..b7d3cd9fc
--- /dev/null
+++ b/docker/centos/binary/swift/swift-container-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-container-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container/config-external.sh b/docker/centos/binary/swift/swift-container/config-external.sh
deleted file mode 120000
index efc76b7af..000000000
--- a/docker/centos/binary/swift/swift-container/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-container/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container/config-internal.sh b/docker/centos/binary/swift/swift-container/config-internal.sh
deleted file mode 120000
index 789a210a3..000000000
--- a/docker/centos/binary/swift/swift-container/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-container/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container/start.sh b/docker/centos/binary/swift/swift-container/start.sh
deleted file mode 120000
index dc3c88490..000000000
--- a/docker/centos/binary/swift/swift-container/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-container/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-data/Dockerfile b/docker/centos/binary/swift/swift-data/Dockerfile
new file mode 100644
index 000000000..ab675045c
--- /dev/null
+++ b/docker/centos/binary/swift/swift-data/Dockerfile
@@ -0,0 +1,13 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+# NOTE(pbourke): This is emulating the Swift "all-in-one" setups where there are 3 disks/partitions
+# on which to mirror data.  This is extremely inefficient and is really only to prove everything
+# works in an AIO setup. For production deploys the Ansible provisioned setup should be used.
+VOLUME [ "/srv/node/sdb1" ]
+VOLUME [ "/srv/node/sdb2" ]
+VOLUME [ "/srv/node/sdb3" ]
+
+# Command needed to start the data container.
+# Note: data containers do not need to be persistent.
+CMD ["/bin/true"]
diff --git a/docker/centos/binary/swift/swift-object/build b/docker/centos/binary/swift/swift-data/build
index ec1913803..ec1913803 120000
--- a/docker/centos/binary/swift/swift-object/build
+++ b/docker/centos/binary/swift/swift-data/build
diff --git a/docker/centos/binary/swift/swift-object/Dockerfile b/docker/centos/binary/swift/swift-object-auditor/Dockerfile
index 4c407ea82..9cbbd53c0 100644
--- a/docker/centos/binary/swift/swift-object/Dockerfile
+++ b/docker/centos/binary/swift/swift-object-auditor/Dockerfile
@@ -1,8 +1,7 @@
-FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
-COPY ./start.sh /start.sh
-
+COPY start.sh /
 COPY config-internal.sh config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-auditor/build b/docker/centos/binary/swift/swift-object-auditor/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-auditor/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/config-external.sh b/docker/centos/binary/swift/swift-object-auditor/config-external.sh
new file mode 120000
index 000000000..1adf26bcb
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-auditor/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-auditor/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/config-internal.sh b/docker/centos/binary/swift/swift-object-auditor/config-internal.sh
new file mode 120000
index 000000000..e3802f38d
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-auditor/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-auditor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/start.sh b/docker/centos/binary/swift/swift-object-auditor/start.sh
new file mode 120000
index 000000000..5ef316559
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-auditor/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-auditor/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-base/Dockerfile b/docker/centos/binary/swift/swift-object-base/Dockerfile
new file mode 100644
index 000000000..c41502e6c
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-base/Dockerfile
@@ -0,0 +1,8 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+        openstack-swift-object \
+    && yum clean all
+
+COPY config-swift-object.sh /opt/kolla/
diff --git a/docker/centos/binary/swift/swift-object-base/build b/docker/centos/binary/swift/swift-object-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-base/config-swift-object.sh b/docker/centos/binary/swift/swift-object-base/config-swift-object.sh
new file mode 120000
index 000000000..a289b4d0d
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-base/config-swift-object.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-base/config-swift-object.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/Dockerfile b/docker/centos/binary/swift/swift-object-expirer/Dockerfile
new file mode 100644
index 000000000..d1a79c6ab
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-expirer/Dockerfile
@@ -0,0 +1,12 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+RUN yum -y install \
+        openstack-swift-proxy \
+        openstack-swift-container \
+    && yum clean all
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-expirer/build b/docker/centos/binary/swift/swift-object-expirer/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-expirer/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/config-external.sh b/docker/centos/binary/swift/swift-object-expirer/config-external.sh
new file mode 120000
index 000000000..7f8d3e37e
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-expirer/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-expirer/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/config-internal.sh b/docker/centos/binary/swift/swift-object-expirer/config-internal.sh
new file mode 120000
index 000000000..ebd7f0f3e
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-expirer/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-expirer/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-expirer/start.sh b/docker/centos/binary/swift/swift-object-expirer/start.sh
new file mode 120000
index 000000000..3b9a9c3ee
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-expirer/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-expirer/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/Dockerfile b/docker/centos/binary/swift/swift-object-replicator/Dockerfile
new file mode 100644
index 000000000..9cbbd53c0
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-replicator/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-replicator/build b/docker/centos/binary/swift/swift-object-replicator/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-replicator/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/config-external.sh b/docker/centos/binary/swift/swift-object-replicator/config-external.sh
new file mode 120000
index 000000000..69e793df4
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-replicator/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-replicator/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/config-internal.sh b/docker/centos/binary/swift/swift-object-replicator/config-internal.sh
new file mode 120000
index 000000000..f2a7e134e
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-replicator/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-replicator/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-replicator/start.sh b/docker/centos/binary/swift/swift-object-replicator/start.sh
new file mode 120000
index 000000000..da27b6312
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-replicator/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-replicator/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/Dockerfile b/docker/centos/binary/swift/swift-object-server/Dockerfile
new file mode 100644
index 000000000..9cbbd53c0
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-server/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-server/build b/docker/centos/binary/swift/swift-object-server/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-server/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/config-external.sh b/docker/centos/binary/swift/swift-object-server/config-external.sh
new file mode 120000
index 000000000..a9213fffa
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-server/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/config-internal.sh b/docker/centos/binary/swift/swift-object-server/config-internal.sh
new file mode 120000
index 000000000..24821e4d2
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-server/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-server/start.sh b/docker/centos/binary/swift/swift-object-server/start.sh
new file mode 120000
index 000000000..7e47f8018
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-server/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-server/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/Dockerfile b/docker/centos/binary/swift/swift-object-updater/Dockerfile
new file mode 100644
index 000000000..9cbbd53c0
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-updater/Dockerfile
@@ -0,0 +1,7 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-object-base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+COPY start.sh /
+COPY config-internal.sh config-external.sh /opt/kolla/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-updater/build b/docker/centos/binary/swift/swift-object-updater/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-updater/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/config-external.sh b/docker/centos/binary/swift/swift-object-updater/config-external.sh
new file mode 120000
index 000000000..94ba9e60c
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-updater/config-external.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-updater/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/config-internal.sh b/docker/centos/binary/swift/swift-object-updater/config-internal.sh
new file mode 120000
index 000000000..fb1e9bdff
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-updater/config-internal.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-updater/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-updater/start.sh b/docker/centos/binary/swift/swift-object-updater/start.sh
new file mode 120000
index 000000000..2e78e5c09
--- /dev/null
+++ b/docker/centos/binary/swift/swift-object-updater/start.sh
@@ -0,0 +1 @@
+../../../../../docker/common/swift/swift-object-updater/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object/config-external.sh b/docker/centos/binary/swift/swift-object/config-external.sh
deleted file mode 120000
index f4256fa63..000000000
--- a/docker/centos/binary/swift/swift-object/config-external.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-object/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object/config-internal.sh b/docker/centos/binary/swift/swift-object/config-internal.sh
deleted file mode 120000
index 3f8ba1de9..000000000
--- a/docker/centos/binary/swift/swift-object/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-object/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object/start.sh b/docker/centos/binary/swift/swift-object/start.sh
deleted file mode 120000
index 690be2540..000000000
--- a/docker/centos/binary/swift/swift-object/start.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/swift/swift-object/start.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/Dockerfile b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
index 4c407ea82..4f8b27b49 100644
--- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
@@ -1,6 +1,8 @@
 FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
+RUN yum -y install openstack-swift-proxy && yum clean all
+
 COPY ./start.sh /start.sh
 
 COPY config-internal.sh config-external.sh /opt/kolla/
diff --git a/docker/centos/binary/swift/swift-proxy-server/config-external.sh b/docker/centos/binary/swift/swift-proxy-server/config-external.sh
index 04e1c640f..178516af5 120000
--- a/docker/centos/binary/swift/swift-proxy-server/config-external.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/config-external.sh
@@ -1 +1 @@
-../../../../common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file
+../../../../../docker/common/swift/swift-proxy-server/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
index f95866fdd..a33b6be4f 120000
--- a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
@@ -1 +1 @@
-../../../../common/swift/swift-proxy-server/config-internal.sh
\ No newline at end of file
+../../../../../docker/common/swift/swift-proxy-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-proxy-server/start.sh b/docker/centos/binary/swift/swift-proxy-server/start.sh
index 6a5581a46..63d0ec91a 120000
--- a/docker/centos/binary/swift/swift-proxy-server/start.sh
+++ b/docker/centos/binary/swift/swift-proxy-server/start.sh
@@ -1 +1 @@
-../../../../common/swift/swift-proxy-server/start.sh
\ No newline at end of file
+../../../../../docker/common/swift/swift-proxy-server/start.sh
\ No newline at end of file