Merge "Remove config-internal for swift"

32 files changed, 16 insertions, 32 deletions

diff --git a/docker/centos/binary/swift/swift-account-server/Dockerfile b/docker/centos/binary/swift/swift-account-server/Dockerfile
index b60a267a8..3ceac3a63 100644
--- a/docker/centos/binary/swift/swift-account-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-account-server/Dockerfile
@@ -6,6 +6,6 @@ RUN yum -y install \
     && yum clean all
 
 COPY start.sh /
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-account-server/config-internal.sh b/docker/centos/binary/swift/swift-account-server/config-internal.sh
deleted file mode 120000
index 93174deb0..000000000
--- a/docker/centos/binary/swift/swift-account-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-account-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-container-server/Dockerfile b/docker/centos/binary/swift/swift-container-server/Dockerfile
index e88e1ebcc..c370032d1 100644
--- a/docker/centos/binary/swift/swift-container-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-container-server/Dockerfile
@@ -6,6 +6,6 @@ RUN yum -y install \
     && yum clean all
 
 COPY start.sh /
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-container-server/config-internal.sh b/docker/centos/binary/swift/swift-container-server/config-internal.sh
deleted file mode 120000
index 3b3c7fcdf..000000000
--- a/docker/centos/binary/swift/swift-container-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-container-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/swift/swift-object-auditor/Dockerfile b/docker/centos/binary/swift/swift-object-auditor/Dockerfile
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/binary/swift/swift-object-auditor/Dockerfile
+++ b/docker/centos/binary/swift/swift-object-auditor/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-auditor/config-internal.sh b/docker/centos/binary/swift/swift-object-auditor/config-internal.sh
deleted file mode 120000
index e3802f38d..000000000
--- a/docker/centos/binary/swift/swift-object-auditor/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-auditor/config-internal.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
index d1a79c6ab..3f3b941c7 100644
--- a/docker/centos/binary/swift/swift-object-expirer/Dockerfile
+++ b/docker/centos/binary/swift/swift-object-expirer/Dockerfile
@@ -7,6 +7,6 @@ RUN yum -y install \
     && yum clean all
 
 COPY start.sh /
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-expirer/config-internal.sh b/docker/centos/binary/swift/swift-object-expirer/config-internal.sh
deleted file mode 120000
index ebd7f0f3e..000000000
--- a/docker/centos/binary/swift/swift-object-expirer/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-expirer/config-internal.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
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/binary/swift/swift-object-replicator/Dockerfile
+++ b/docker/centos/binary/swift/swift-object-replicator/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-replicator/config-internal.sh b/docker/centos/binary/swift/swift-object-replicator/config-internal.sh
deleted file mode 120000
index f2a7e134e..000000000
--- a/docker/centos/binary/swift/swift-object-replicator/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-replicator/config-internal.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
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/binary/swift/swift-object-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-object-server/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-server/config-internal.sh b/docker/centos/binary/swift/swift-object-server/config-internal.sh
deleted file mode 120000
index 24821e4d2..000000000
--- a/docker/centos/binary/swift/swift-object-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-server/config-internal.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
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/binary/swift/swift-object-updater/Dockerfile
+++ b/docker/centos/binary/swift/swift-object-updater/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-object-updater/config-internal.sh b/docker/centos/binary/swift/swift-object-updater/config-internal.sh
deleted file mode 120000
index fb1e9bdff..000000000
--- a/docker/centos/binary/swift/swift-object-updater/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-updater/config-internal.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 4f8b27b49..2cc54e938 100644
--- a/docker/centos/binary/swift/swift-proxy-server/Dockerfile
+++ b/docker/centos/binary/swift/swift-proxy-server/Dockerfile
@@ -5,6 +5,6 @@ RUN yum -y install openstack-swift-proxy && yum clean all
 
 COPY ./start.sh /start.sh
 
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh b/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
deleted file mode 120000
index a33b6be4f..000000000
--- a/docker/centos/binary/swift/swift-proxy-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-proxy-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-account-server/Dockerfile b/docker/centos/source/swift/swift-account-server/Dockerfile
index fc97fa8d3..c923e339e 100644
--- a/docker/centos/source/swift/swift-account-server/Dockerfile
+++ b/docker/centos/source/swift/swift-account-server/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY start.sh /
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-account-server/config-internal.sh b/docker/centos/source/swift/swift-account-server/config-internal.sh
deleted file mode 120000
index 93174deb0..000000000
--- a/docker/centos/source/swift/swift-account-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-account-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-container-server/Dockerfile b/docker/centos/source/swift/swift-container-server/Dockerfile
index fc97fa8d3..c923e339e 100644
--- a/docker/centos/source/swift/swift-container-server/Dockerfile
+++ b/docker/centos/source/swift/swift-container-server/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%swift-base:%%KOLLA_TAG%%
 MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 COPY start.sh /
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-container-server/config-internal.sh b/docker/centos/source/swift/swift-container-server/config-internal.sh
deleted file mode 120000
index 3b3c7fcdf..000000000
--- a/docker/centos/source/swift/swift-container-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-container-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-auditor/Dockerfile b/docker/centos/source/swift/swift-object-auditor/Dockerfile
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/source/swift/swift-object-auditor/Dockerfile
+++ b/docker/centos/source/swift/swift-object-auditor/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-auditor/config-internal.sh b/docker/centos/source/swift/swift-object-auditor/config-internal.sh
deleted file mode 120000
index e3802f38d..000000000
--- a/docker/centos/source/swift/swift-object-auditor/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-auditor/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-expirer/Dockerfile b/docker/centos/source/swift/swift-object-expirer/Dockerfile
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/source/swift/swift-object-expirer/Dockerfile
+++ b/docker/centos/source/swift/swift-object-expirer/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-expirer/config-internal.sh b/docker/centos/source/swift/swift-object-expirer/config-internal.sh
deleted file mode 120000
index ebd7f0f3e..000000000
--- a/docker/centos/source/swift/swift-object-expirer/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-expirer/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-replicator/Dockerfile b/docker/centos/source/swift/swift-object-replicator/Dockerfile
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/source/swift/swift-object-replicator/Dockerfile
+++ b/docker/centos/source/swift/swift-object-replicator/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-replicator/config-internal.sh b/docker/centos/source/swift/swift-object-replicator/config-internal.sh
deleted file mode 120000
index f2a7e134e..000000000
--- a/docker/centos/source/swift/swift-object-replicator/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-replicator/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-server/Dockerfile b/docker/centos/source/swift/swift-object-server/Dockerfile
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/source/swift/swift-object-server/Dockerfile
+++ b/docker/centos/source/swift/swift-object-server/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-server/config-internal.sh b/docker/centos/source/swift/swift-object-server/config-internal.sh
deleted file mode 120000
index 24821e4d2..000000000
--- a/docker/centos/source/swift/swift-object-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-server/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-object-updater/Dockerfile b/docker/centos/source/swift/swift-object-updater/Dockerfile
index 9cbbd53c0..eb070cce9 100644
--- a/docker/centos/source/swift/swift-object-updater/Dockerfile
+++ b/docker/centos/source/swift/swift-object-updater/Dockerfile
@@ -2,6 +2,6 @@ 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/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-object-updater/config-internal.sh b/docker/centos/source/swift/swift-object-updater/config-internal.sh
deleted file mode 120000
index fb1e9bdff..000000000
--- a/docker/centos/source/swift/swift-object-updater/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-object-updater/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/swift/swift-proxy-server/Dockerfile b/docker/centos/source/swift/swift-proxy-server/Dockerfile
index 737ae80e0..cbd4357f3 100644
--- a/docker/centos/source/swift/swift-proxy-server/Dockerfile
+++ b/docker/centos/source/swift/swift-proxy-server/Dockerfile
@@ -3,6 +3,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 
 
 COPY ./start.sh /start.sh
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
 
 CMD ["/start.sh"]
diff --git a/docker/centos/source/swift/swift-proxy-server/config-internal.sh b/docker/centos/source/swift/swift-proxy-server/config-internal.sh
deleted file mode 120000
index a33b6be4f..000000000
--- a/docker/centos/source/swift/swift-proxy-server/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../docker/common/swift/swift-proxy-server/config-internal.sh
\ No newline at end of file