aboutsummaryrefslogtreecommitdiff
path: root/docker/centos/source/ceilometer/ceilometer-api
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2015-08-09 17:18:22 +0000
committerGerrit Code Review <review@openstack.org>2015-08-09 17:18:22 +0000
commit35142a0b75d26b8929a9d7e4ea83fb870534025b (patch)
tree860b6ff16668b711cd00941f0a620921e212cdb6 /docker/centos/source/ceilometer/ceilometer-api
parent1340321eb5bcf6817fd13d44bdbf7ec39f9e956b (diff)
parentb84abb9425afebddf0109ecb36e383c2a228b5a8 (diff)
downloadkolla-35142a0b75d26b8929a9d7e4ea83fb870534025b.tar.gz
kolla-35142a0b75d26b8929a9d7e4ea83fb870534025b.zip
Merge "Remove config-internal from ceilometer"
Diffstat (limited to 'docker/centos/source/ceilometer/ceilometer-api')
-rw-r--r--docker/centos/source/ceilometer/ceilometer-api/Dockerfile2
l---------docker/centos/source/ceilometer/ceilometer-api/config-internal.sh1
2 files changed, 1 insertions, 2 deletions
diff --git a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
index 91baaf939..5db74a001 100644
--- a/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
+++ b/docker/centos/source/ceilometer/ceilometer-api/Dockerfile
@@ -2,5 +2,5 @@ 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/
+COPY config-external.sh /opt/kolla/
CMD ["/start.sh"]
diff --git a/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh b/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh
deleted file mode 120000
index 589c797ec..000000000
--- a/docker/centos/source/ceilometer/ceilometer-api/config-internal.sh
+++ /dev/null
@@ -1 +0,0 @@
-../../../../common/ceilometer/ceilometer-api/config-internal.sh \ No newline at end of file