Merge "Add config-internal/config-external for Ceilometer"

18 files changed, 23 insertions, 0 deletions

diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
index fe6c44fc2..24e036925 100644
--- a/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/Dockerfile
@@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum install -y openstack-ceilometer-alarm && yum clean all
 
 ADD ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh
new file mode 120000
index 000000000..0a48ebf52
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/config-external.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-alarm/config-external.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh b/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh
new file mode 120000
index 000000000..0f009e4be
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-alarm/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-alarm/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
index 7a1337c7b..387660fff 100644
--- a/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-api/Dockerfile
@@ -4,4 +4,5 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum install -y openstack-ceilometer-api && yum clean all
 
 ADD ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh
new file mode 120000
index 000000000..4ea59dad7
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-api/config-external.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-api/config-external.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
new file mode 120000
index 000000000..589c797ec
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-api/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-api/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
index bd5137306..29ebbdc93 100644
--- a/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-central/Dockerfile
@@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum install -y openstack-ceilometer-central && yum clean all
 
 ADD ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh
new file mode 120000
index 000000000..cfc69e75d
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-central/config-external.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-central/config-external.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
new file mode 120000
index 000000000..86fd40c4a
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-central/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-central/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
index 6c54dce4a..a715014ce 100644
--- a/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/Dockerfile
@@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum install -y openstack-ceilometer-collector && yum clean all
 
 ADD ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh
new file mode 120000
index 000000000..e16dcecc1
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/config-external.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-collector/config-external.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
new file mode 120000
index 000000000..de90be372
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-collector/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-collector/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
index 9f2a701d8..3d476d8e5 100644
--- a/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/Dockerfile
@@ -5,4 +5,6 @@ RUN yum install -y openstack-ceilometer-compute python-ceilometerclient python-p
     && yum clean all
 
 ADD ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh
new file mode 120000
index 000000000..1d0c728e5
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/config-external.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-compute/config-external.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
new file mode 120000
index 000000000..ceefe1a9e
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-compute/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-compute/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
index 72d291bcb..7d6f2763d 100644
--- a/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/Dockerfile
@@ -4,4 +4,6 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
 RUN yum install -y openstack-ceilometer-notification && yum clean all
 
 ADD ./start.sh /start.sh
+COPY config-internal.sh config-external.sh /opt/kolla/
+
 CMD ["/start.sh"]
diff --git a/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh
new file mode 120000
index 000000000..12d98d9ee
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/config-external.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-notification/config-external.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
new file mode 120000
index 000000000..75a4ba990
--- /dev/null
+++ b/docker/centos/binary/ceilometer/ceilometer-notification/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-notification/config-internal.sh
\ No newline at end of file