From e13cb31ccb6ba23ac84199f18328b21ffc121f3c Mon Sep 17 00:00:00 2001
From: Sam Yaple <sam@yaple.net>
Date: Thu, 27 Aug 2015 10:03:25 +0000
Subject: [PATCH] Unify Centos and Ubuntu Source Install - Ceilometer
A change merged in the base allows for Centos and Ubuntu to install
all python things to the same locations. This updates the source
section to reflect that change.
Change-Id: Iab907f680d08a3f3ed1d13b6867df01853105fc4
Partially-Implements: blueprint install-from-ubuntu
---
docker_templates/ceilometer/ceilometer-alarm/build | 1 -
docker_templates/ceilometer/ceilometer-api/build | 1 -
.../ceilometer/ceilometer-base/Dockerfile.j2 | 13 +++++--------
docker_templates/ceilometer/ceilometer-base/build | 1 -
.../ceilometer/ceilometer-central/build | 1 -
.../ceilometer/ceilometer-collector/build | 1 -
.../ceilometer/ceilometer-compute/build | 1 -
.../ceilometer/ceilometer-notification/build | 1 -
8 files changed, 5 insertions(+), 15 deletions(-)
delete mode 120000 docker_templates/ceilometer/ceilometer-alarm/build
delete mode 120000 docker_templates/ceilometer/ceilometer-api/build
delete mode 120000 docker_templates/ceilometer/ceilometer-base/build
delete mode 120000 docker_templates/ceilometer/ceilometer-central/build
delete mode 120000 docker_templates/ceilometer/ceilometer-collector/build
delete mode 120000 docker_templates/ceilometer/ceilometer-compute/build
delete mode 120000 docker_templates/ceilometer/ceilometer-notification/build
diff --git a/docker_templates/ceilometer/ceilometer-alarm/build b/docker_templates/ceilometer/ceilometer-alarm/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-alarm/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/ceilometer/ceilometer-api/build b/docker_templates/ceilometer/ceilometer-api/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-api/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2 b/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
index eb3b9e060b..92a3b70d93 100644
--- a/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker_templates/ceilometer/ceilometer-base/Dockerfile.j2
@@ -10,15 +10,12 @@ RUN echo '{{ install_type }} not yet available for {{ base_distro }}' \
{% endif %}
{% elif install_type == 'source' %}
-ADD ./ceilometer.tar /
-RUN ln -s /ceilometer-* /ceilometer
-
-RUN cd /ceilometer \
+ADD ceilometer.tar /
+RUN ln -s /ceilometer-* ceilometer \
&& useradd --user-group ceilometer \
- && pip install -r requirements.txt \
- && pip install /ceilometer \
- && mkdir /etc/ceilometer /var/log/ceilometer \
+ && pip --no-cache-dir install /ceilometer \
+ && mkdir -p /etc/ceilometer /var/log/ceilometer /home/ceilometer \
&& cp -r /ceilometer/etc/* /etc/ceilometer/ \
- && rm -rf /root/.cache
+ && chown -R ceilometer: /etc/ceilometer /var/log/ceilometer /home/ceilometer
{% endif %}
diff --git a/docker_templates/ceilometer/ceilometer-base/build b/docker_templates/ceilometer/ceilometer-base/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-base/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/ceilometer/ceilometer-central/build b/docker_templates/ceilometer/ceilometer-central/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-central/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/ceilometer/ceilometer-collector/build b/docker_templates/ceilometer/ceilometer-collector/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-collector/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/ceilometer/ceilometer-compute/build b/docker_templates/ceilometer/ceilometer-compute/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-compute/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file
diff --git a/docker_templates/ceilometer/ceilometer-notification/build b/docker_templates/ceilometer/ceilometer-notification/build
deleted file mode 120000
index 43944faa00..0000000000
--- a/docker_templates/ceilometer/ceilometer-notification/build
+++ /dev/null
@@ -1 +0,0 @@
-../../../tools/build-docker-image
\ No newline at end of file