diff options
Diffstat (limited to 'docker/ceilometer/ceilometer-api')
| -rw-r--r-- | docker/ceilometer/ceilometer-api/Dockerfile.j2 | 9 | ||||
| -rw-r--r--[-rwxr-xr-x] | docker/ceilometer/ceilometer-api/extend_start.sh (renamed from docker/ceilometer/ceilometer-api/start.sh) | 9 |
2 files changed, 3 insertions, 15 deletions
diff --git a/docker/ceilometer/ceilometer-api/Dockerfile.j2 b/docker/ceilometer/ceilometer-api/Dockerfile.j2 index 7470a9026..0519d6f0f 100644 --- a/docker/ceilometer/ceilometer-api/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-api/Dockerfile.j2 @@ -4,16 +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-api \ - && yum clean all + && yum clean all {% endif %} {% endif %} -COPY ./start.sh / -COPY config-external.sh /opt/kolla/ - -CMD ["/start.sh"] +COPY extend_start.sh /usr/local/bin/kolla_extend_start +RUN chmod 755 /usr/local/bin/kolla_extend_start {{ include_footer }} diff --git a/docker/ceilometer/ceilometer-api/start.sh b/docker/ceilometer/ceilometer-api/extend_start.sh index 6ba3cc37d..afe612ae6 100755..100644 --- a/docker/ceilometer/ceilometer-api/start.sh +++ b/docker/ceilometer/ceilometer-api/extend_start.sh @@ -1,11 +1,4 @@ #!/bin/bash -set -o errexit - -CMD="/usr/bin/ceilometer-api" -ARGS="" - -# Loading common functions. -source /opt/kolla/kolla-common.sh # Bootstrap and exit if KOLLA_BOOTSTRAP variable is set. This catches all cases # of the KOLLA_BOOTSTRAP variable being set, including empty. @@ -13,5 +6,3 @@ if [[ "${!KOLLA_BOOTSTRAP[@]}" ]]; then su -s /bin/sh -c "ceilometer-manage db_sync" ceilometer exit 0 fi - -exec $CMD $ARGS |