From bd998529358d87fc714d31a659d288e8b3f0702b Mon Sep 17 00:00:00 2001
From: "Swapnil Kulkarni (coolsvap)" <me@coolsvap.net>
Date: Thu, 26 Nov 2015 15:09:19 +0530
Subject: [PATCH] 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
---
 docker/ceilometer/ceilometer-alarm/Dockerfile.j2  | 15 ---------------
 .../ceilometer-alarm/config-external.sh           | 10 ----------
 2 files changed, 25 deletions(-)
 delete mode 100644 docker/ceilometer/ceilometer-alarm/Dockerfile.j2
 delete mode 100644 docker/ceilometer/ceilometer-alarm/config-external.sh

diff --git a/docker/ceilometer/ceilometer-alarm/Dockerfile.j2 b/docker/ceilometer/ceilometer-alarm/Dockerfile.j2
deleted file mode 100644
index 83b032926c..0000000000
--- 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 2c46075301..0000000000
--- 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