Merge "Add build from source for Ceilometer"

34 files changed, 94 insertions, 0 deletions

diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
new file mode 100644
index 000000000..fd640691a
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-alarm/Dockerfile
@@ -0,0 +1,7 @@
+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/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/build b/docker/centos/source/ceilometer/ceilometer-alarm/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-alarm/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-external.sh
new file mode 120000
index 000000000..0a48ebf52
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-alarm/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-alarm/config-internal.sh
new file mode 120000
index 000000000..0f009e4be
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-alarm/start.sh b/docker/centos/source/ceilometer/ceilometer-alarm/start.sh
new file mode 120000
index 000000000..ed3ac528d
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-alarm/start.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-alarm/start.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
new file mode 100644
index 000000000..91baaf939
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
@@ -0,0 +1,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/
+CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-api/build b/docker/centos/source/ceilometer/ceilometer-api/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-api/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-api/config-external.sh b/docker/centos/source/ceilometer/ceilometer-api/config-external.sh
new file mode 120000
index 000000000..4ea59dad7
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-api/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh
new file mode 120000
index 000000000..589c797ec
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-api/start.sh b/docker/centos/source/ceilometer/ceilometer-api/start.sh
new file mode 120000
index 000000000..7acfa2cba
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-api/start.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-api/start.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-base/.buildinfo b/docker/centos/source/ceilometer/ceilometer-base/.buildinfo
new file mode 100644
index 000000000..70bd3d7d3
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-base/.buildinfo
@@ -0,0 +1,10 @@
+# Build info specific to this image. All values can be overridden in .buildconf
+
+COMPONENT=ceilometer
+SOURCE_INSTALL_AVAILABLE=1
+
+# Used for git install method
+: ${CLONE_FROM:=https://github.com/openstack/ceilometer}
+
+# Used for curl install method
+: ${TARBALL_URI:=http://tarballs.openstack.org/ceilometer/ceilometer-master.tar.gz}
diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
new file mode 100644
index 000000000..98d53fc88
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile
@@ -0,0 +1,17 @@
+FROM %%KOLLA_NAMESPACE%%/%%KOLLA_PREFIX%%base:%%KOLLA_TAG%%
+MAINTAINER Kolla Project (https://launchpad.net/kolla)
+
+ADD ./ceilometer.tar /
+RUN ln -s /ceilometer-* /ceilometer
+
+RUN cd /ceilometer \
+    && useradd --user-group ceilometer \
+    && pip install -r requirements.txt \
+    && pip install /ceilometer \
+    && mkdir /etc/ceilometer /var/log/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/build b/docker/centos/source/ceilometer/ceilometer-base/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-base/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh b/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh
new file mode 120000
index 000000000..63215435d
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-base/config-ceilometer.sh
@@ -0,0 +1 @@
+../../../../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
new file mode 100644
index 000000000..fd640691a
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-central/Dockerfile
@@ -0,0 +1,7 @@
+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/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-central/build b/docker/centos/source/ceilometer/ceilometer-central/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-central/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-central/config-external.sh b/docker/centos/source/ceilometer/ceilometer-central/config-external.sh
new file mode 120000
index 000000000..cfc69e75d
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-central/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-central/config-internal.sh
new file mode 120000
index 000000000..86fd40c4a
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-central/start.sh b/docker/centos/source/ceilometer/ceilometer-central/start.sh
new file mode 120000
index 000000000..8df383cd1
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-central/start.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-central/start.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
new file mode 100644
index 000000000..fd640691a
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-collector/Dockerfile
@@ -0,0 +1,7 @@
+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/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/build b/docker/centos/source/ceilometer/ceilometer-collector/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-collector/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-external.sh
new file mode 120000
index 000000000..e16dcecc1
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-collector/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-collector/config-internal.sh
new file mode 120000
index 000000000..de90be372
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-collector/start.sh b/docker/centos/source/ceilometer/ceilometer-collector/start.sh
new file mode 120000
index 000000000..bea2eb09c
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-collector/start.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-collector/start.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
new file mode 100644
index 000000000..fd640691a
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-compute/Dockerfile
@@ -0,0 +1,7 @@
+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/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/build b/docker/centos/source/ceilometer/ceilometer-compute/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-compute/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-external.sh
new file mode 120000
index 000000000..1d0c728e5
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-compute/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-compute/config-internal.sh
new file mode 120000
index 000000000..ceefe1a9e
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-compute/start.sh b/docker/centos/source/ceilometer/ceilometer-compute/start.sh
new file mode 120000
index 000000000..1118b9552
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-compute/start.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-compute/start.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
new file mode 100644
index 000000000..fd640691a
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-notification/Dockerfile
@@ -0,0 +1,7 @@
+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/
+
+CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/build b/docker/centos/source/ceilometer/ceilometer-notification/build
new file mode 120000
index 000000000..ec1913803
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-notification/build
@@ -0,0 +1 @@
+../../../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-external.sh
new file mode 120000
index 000000000..12d98d9ee
--- /dev/null
+++ b/docker/centos/source/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/source/ceilometer/ceilometer-notification/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh
new file mode 120000
index 000000000..75a4ba990
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-notification/config-internal.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-notification/config-internal.sh
\ No newline at end of file
diff --git a/docker/centos/source/ceilometer/ceilometer-notification/start.sh b/docker/centos/source/ceilometer/ceilometer-notification/start.sh
new file mode 120000
index 000000000..8e6d4e337
--- /dev/null
+++ b/docker/centos/source/ceilometer/ceilometer-notification/start.sh
@@ -0,0 +1 @@
+../../../../common/ceilometer/ceilometer-notification/start.sh
\ No newline at end of file