Remove config-internal from ceilometer

Change-Id: I273c91d1300c1b30f7263195657e3510975f6f50
Partially-Implements: blueprint remove-config-internal

21 files changed, 6 insertions, 22 deletions

diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh
deleted file mode 120000
index 0f009e4be..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-alarm/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh
deleted file mode 120000
index 589c797ec..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh
deleted file mode 120000
index 63215435d..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-base/config-ceilometer.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-base/config-ceilometer.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh
deleted file mode 120000
index 86fd40c4a..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-central/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh
deleted file mode 120000
index de90be372..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-collector/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh
deleted file mode 120000
index ceefe1a9e..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh
deleted file mode 120000
index 75a4ba990..000000000
--- a/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-notification/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
index fd640691a..86cf40d92 100644
--- a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
 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/ceilometer/ceilometer-alarm/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-internal.sh
deleted file mode 120000
index 0f009e4be..000000000
--- a/docker/centos/source/ceilometer/ceilometer-alarm/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-alarm/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
index 91baaf939..5db74a001 100644
--- a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
@@ -2,5 +2,5 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
 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/ceilometer/ceilometer-api/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh
deleted file mode 120000
index 589c797ec..000000000
--- a/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
index 98d53fc88..0b4e0e63d 100644
--- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
@@ -12,6 +12,4 @@ RUN cd /ceilometer \
     && cp -r /ceilometer/etc/* /etc/ceilometer/ \
     && rm -rf /root/.cache
 
-COPY config-ceilometer.sh /opt/kolla/
-
 CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh
deleted file mode 120000
index 63215435d..000000000
--- a/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-base/config-ceilometer.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile
index fd640691a..86cf40d92 100644
--- a/docker/centos/source/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
 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/ceilometer/ceilometer-central/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-central/config-internal.sh
deleted file mode 120000
index 86fd40c4a..000000000
--- a/docker/centos/source/ceilometer/ceilometer-central/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-central/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile
index fd640691a..86cf40d92 100644
--- a/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
 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/ceilometer/ceilometer-collector/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-internal.sh
deleted file mode 120000
index de90be372..000000000
--- a/docker/centos/source/ceilometer/ceilometer-collector/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-collector/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile
index fd640691a..86cf40d92 100644
--- a/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
 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/ceilometer/ceilometer-compute/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-internal.sh
deleted file mode 120000
index ceefe1a9e..000000000
--- a/docker/centos/source/ceilometer/ceilometer-compute/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile
index fd640691a..86cf40d92 100644
--- a/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile
@@ -2,6 +2,6 @@ FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%ceilometer-base:%%KOLLA_TAG%%
 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/ceilometer/ceilometer-notification/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh
deleted file mode 120000
index 75a4ba990..000000000
--- a/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-notification/config-internal.sh
\ No newline at end of file