diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-27 16:45:08 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-27 16:45:09 +0000 |
| commit | 63db5ce3d893483bc906085b1c85400cdaa782cf (patch) | |
| tree | 9a9b1801b7379a963dae45dcd34611516d780922 | |
| parent | 79773a3d6bcfbe83403fdfd46d14b14d902fe0c2 (diff) | |
| parent | e13cb31ccb6ba23ac84199f18328b21ffc121f3c (diff) | |
| download | kolla-63db5ce3d893483bc906085b1c85400cdaa782cf.tar.gz kolla-63db5ce3d893483bc906085b1c85400cdaa782cf.zip | |
Merge "Unify Centos and Ubuntu Source Install - Ceilometer"
8 files changed, 5 insertions, 15 deletions
diff --git a/docker_templates/ceilometer/ceilometer-alarm/build b/docker_templates/ceilometer/ceilometer-alarm/build deleted file mode 120000 index 43944faa0..000000000 --- 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 43944faa0..000000000 --- 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 eb3b9e060..92a3b70d9 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 43944faa0..000000000 --- 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 43944faa0..000000000 --- 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 43944faa0..000000000 --- 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 43944faa0..000000000 --- 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 43944faa0..000000000 --- a/docker_templates/ceilometer/ceilometer-notification/build +++ /dev/null @@ -1 +0,0 @@ -../../../tools/build-docker-image
\ No newline at end of file |