diff options
| author | Jenkins <jenkins@review.openstack.org> | 2015-11-27 15:01:38 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2015-11-27 15:01:38 +0000 |
| commit | f294b5ce2918779e130c76a54252b21f8d32f6e7 (patch) | |
| tree | 9937dc04b15eb56d6cc176276cf3ca97ddcd3271 /docker/ceilometer | |
| parent | 563b56126991cfc2f3378f803e071ad79aca3487 (diff) | |
| parent | bd998529358d87fc714d31a659d288e8b3f0702b (diff) | |
| download | kolla-f294b5ce2918779e130c76a54252b21f8d32f6e7.tar.gz kolla-f294b5ce2918779e130c76a54252b21f8d32f6e7.zip | |
Merge "Unblock the gate for ceilometer-alarm failures"
Diffstat (limited to 'docker/ceilometer')
| -rw-r--r-- | docker/ceilometer/ceilometer-alarm/Dockerfile.j2 | 15 | ||||
| -rw-r--r-- | docker/ceilometer/ceilometer-alarm/config-external.sh | 10 |
2 files changed, 0 insertions, 25 deletions
diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 deleted file mode 100644 index 83b032926..000000000 --- a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 +++ /dev/null @@ -1,15 +0,0 @@ -FROM {{ namespace }}/{{ image_prefix }}ceilometer-base:{{ tag }} -MAINTAINER {{ maintainer }} - -{% if install_type == 'binary' %} - {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} - -RUN yum install -y openstack-ceilometer-alarm \ - && yum clean all - - {% endif %} -{% endif %} - -{{ include_footer }} - -USER ceilometer diff --git a/docker/ceilometer/ceilometer-alarm/config-external.sh b/docker/ceilometer/ceilometer-alarm/config-external.sh deleted file mode 100644 index 2c4607530..000000000 --- a/docker/ceilometer/ceilometer-alarm/config-external.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash -SOURCE="/var/lib/kolla/ceilometer/ceilometer.conf" -TARGET="/etc/ceilometer/ceilometer.conf" -OWNER="ceilometer" - -if [[ -f "$SOURCE" ]]; then - cp $SOURCE $TARGET - chown ${OWNER}: $TARGET - chmod 0644 $TARGET -fi |