diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-08-14 08:59:19 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-08-14 08:59:19 +0000 |
| commit | 171c6f978efeec9fdcfcccf9dcb8cf394467fa5d (patch) | |
| tree | 191c68b06e9dadb0513894e51654efdacee8ffcf /docker/centos | |
| parent | 512d64a97826b2f047130e97f9be62e45a2a3808 (diff) | |
| parent | 82187c2568e5815d362306d789e4f9a6842f1360 (diff) | |
| download | kolla-171c6f978efeec9fdcfcccf9dcb8cf394467fa5d.tar.gz kolla-171c6f978efeec9fdcfcccf9dcb8cf394467fa5d.zip | |
Merge "Ceilometer install from source incorrectly places config"
Diffstat (limited to 'docker/centos')
| -rw-r--r-- | docker/centos/source/ceilometer/ceilometer-base/Dockerfile | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile index 0b4e0e63d..514724137 100644 --- a/docker/centos/source/ceilometer/ceilometer-base/Dockerfile +++ b/docker/centos/source/ceilometer/ceilometer-base/Dockerfile @@ -9,7 +9,7 @@ RUN cd /ceilometer \ && pip install -r requirements.txt \ && pip install /ceilometer \ && mkdir /etc/ceilometer /var/log/ceilometer \ - && cp -r /ceilometer/etc/* /etc/ceilometer/ \ + && cp -r /ceilometer/etc/* /etc/ \ && rm -rf /root/.cache CMD ["/start.sh"] |