aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/binary
diff options
context:
space:
mode:
authorSteven Dake <stdake@cisco.com>2015-08-07 09:19:17 -0700
committerSteven Dake <stdake@cisco.com>2015-08-07 22:36:35 -0700
commitb471aa42d282d502617ed9e215d238e32013e85b (patch)
tree2250a2b0ec7ed2378d8a4b96ebe15250045a0865 /docker/centos/binary
parent9f730537d277e90ba35a528aad324e9fe476a154 (diff)
downloadkolla-b471aa42d282d502617ed9e215d238e32013e85b.tar.gz
kolla-b471aa42d282d502617ed9e215d238e32013e85b.zip
Remove config-internal from glance
Change-Id: I611a5cc41f9d227312755fb674f9a59219c2860c Partially-Implements: blueprint remove-config-internal
Diffstat (limited to 'docker/centos/binary')
-rw-r--r--docker/centos/binary/glance/glance-api/Dockerfile2
l---------docker/centos/binary/glance/glance-api/config-internal.sh1
l---------docker/centos/binary/glance/glance-base/config-glance.sh1
-rw-r--r--docker/centos/binary/glance/glance-registry/Dockerfile2
l---------docker/centos/binary/glance/glance-registry/config-internal.sh1
5 files changed, 2 insertions, 5 deletions
diff --git a/docker/centos/binary/glance/glance-api/Dockerfile b/docker/centos/binary/glance/glance-api/Dockerfile
index dc123fc1b..34de0690e 100644
--- a/docker/centos/binary/glance/glance-api/Dockerfile
+++ b/docker/centos/binary/glance/glance-api/Dockerfile
@@ -4,6 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
COPY ./start.sh /start.sh
COPY ./check.sh /check.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/glance/glance-api/config-internal.sh b/docker/centos/binary/glance/glance-api/config-internal.sh
deleted file mode 120000
index 112e6557c..000000000
--- a/docker/centos/binary/glance/glance-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-api/config-internal.sh \ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-base/config-glance.sh b/docker/centos/binary/glance/glance-base/config-glance.sh
deleted file mode 120000
index d5c26f0b8..000000000
--- a/docker/centos/binary/glance/glance-base/config-glance.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-base/config-glance.sh \ No newline at end of file
diff --git a/docker/centos/binary/glance/glance-registry/Dockerfile b/docker/centos/binary/glance/glance-registry/Dockerfile
index 5ff660923..11b584eed 100644
--- a/docker/centos/binary/glance/glance-registry/Dockerfile
+++ b/docker/centos/binary/glance/glance-registry/Dockerfile
@@ -1,7 +1,7 @@
FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%glance-base:%%KOLLA_TAG%%
MAINTAINER Kolla Project (https://launchpad.net/kolla)
-COPY config-internal.sh config-external.sh /opt/kolla/
+COPY config-external.sh /opt/kolla/
COPY ./start.sh /start.sh
CMD ["/start.sh"]
diff --git a/docker/centos/binary/glance/glance-registry/config-internal.sh b/docker/centos/binary/glance/glance-registry/config-internal.sh
deleted file mode 120000
index c3d48cfc0..000000000
--- a/docker/centos/binary/glance/glance-registry/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/glance/glance-registry/config-internal.sh \ No newline at end of file