summaryrefslogtreecommitdiff
path: root/docker/ceilometer
diff options
context:
space:
mode:
authorSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2015-11-26 15:09:19 +0530
committerSwapnil Kulkarni (coolsvap) <me@coolsvap.net>2015-11-26 20:03:01 +0530
commitbd998529358d87fc714d31a659d288e8b3f0702b (patch)
tree668c8768028bab5dabab3e635f1957430649e1cb /docker/ceilometer
parent3888c21a312502e6d34264e8aba8899eb6a5f3b8 (diff)
downloadkolla-bd998529358d87fc714d31a659d288e8b3f0702b.tar.gz
kolla-bd998529358d87fc714d31a659d288e8b3f0702b.zip
Unblock the gate for ceilometer-alarm failures
Removing the ceilometer-alarm container since the module has been replaced with aodh Change-Id: I1b9a5337e40bddaedd0e112bc9b94fba8a1ba3b4 Closes-Bug:#1520074
Diffstat (limited to 'docker/ceilometer')
-rw-r--r--docker/ceilometer/ceilometer-alarm/Dockerfile.j215
-rw-r--r--docker/ceilometer/ceilometer-alarm/config-external.sh10
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