openstack/kolla-ansible
Code Issues Proposed changes

Merge "Unblock the gate for ceilometer-alarm failures"

Browse Source
This commit is contained in:
Jenkins 2015-11-27 15:01:38 +00:00 committed by Gerrit Code Review
commit f294b5ce29
2 changed files with 0 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
docker/ceilometer/ceilometer-alarm/Dockerfile.j2
View File

@ -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

10
docker/ceilometer/ceilometer-alarm/config-external.sh
View File

@ -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