aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer/ceilometer-compute
diff options
context:
space:
mode:
Diffstat (limited to 'docker/ceilometer/ceilometer-compute')
-rw-r--r--docker/ceilometer/ceilometer-compute/Dockerfile.j214
-rwxr-xr-xdocker/ceilometer/ceilometer-compute/start.sh10
2 files changed, 5 insertions, 19 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
index dd6bc62af..d2f75134d 100644
--- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2
@@ -4,17 +4,13 @@ MAINTAINER Kolla Project (https://launchpad.net/kolla)
{% if install_type == 'binary' %}
{% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %}
-RUN yum install -y openstack-ceilometer-compute \
- python-ceilometerclient \
- python-pecan \
- && yum clean all
+RUN yum install -y \
+ openstack-ceilometer-compute \
+ python-ceilometerclient \
+ python-pecan \
+ && yum clean all
{% endif %}
{% endif %}
-COPY ./start.sh /
-COPY config-external.sh /opt/kolla/
-
-CMD ["/start.sh"]
-
{{ include_footer }}
diff --git a/docker/ceilometer/ceilometer-compute/start.sh b/docker/ceilometer/ceilometer-compute/start.sh
deleted file mode 100755
index f17a32709..000000000
--- a/docker/ceilometer/ceilometer-compute/start.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-set -o errexit
-
-CMD="/usr/bin/ceilometer-agent-compute"
-ARGS=""
-
-# Loading common functions.
-source /opt/kolla/kolla-common.sh
-
-exec $CMD $ARGS