aboutsummaryrefslogtreecommitdiff
path: root/docker/ceilometer
diff options
context:
space:
mode:
authorJeffrey Zhang <zhang.lei.fly@gmail.com>2017-03-13 00:05:27 +0800
committerJeffrey Zhang <zhang.lei.fly@gmail.com>2017-03-13 12:36:06 +0800
commit5558bd53fb6e8771534664580e814b4b8fa4ef3e (patch)
treee9c1d8438eab0a052910b228264d9a0d4eec3cd0 /docker/ceilometer
parent8d37c9fe3500627684225a00aa8a94446c78eec3 (diff)
downloadkolla-5558bd53fb6e8771534664580e814b4b8fa4ef3e.tar.gz
kolla-5558bd53fb6e8771534664580e814b4b8fa4ef3e.zip
Install panko in ceilometer base container
When using panko event dispather in ceilometer, panko's code is required. Closes-Bug: #1672241 Change-Id: Ie03f6fcda0ecd09511c09c962b9bd14ae67f1ad3
Diffstat (limited to 'docker/ceilometer')
-rw-r--r--docker/ceilometer/ceilometer-base/Dockerfile.j212
1 files changed, 11 insertions, 1 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2
index 552300dce..7023a752d 100644
--- a/docker/ceilometer/ceilometer-base/Dockerfile.j2
+++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2
@@ -13,6 +13,7 @@ MAINTAINER {{ maintainer }}
# https://review.rdoproject.org/r/#/c/5633/
{% set ceilometer_base_packages = [
'openstack-ceilometer-common',
+ 'python-panko',
'python-gnocchiclient',
'python-tooz',
'python-oslo-db',
@@ -23,6 +24,7 @@ MAINTAINER {{ maintainer }}
{% set ceilometer_base_packages = [
'ceilometer-common',
'python-gnocchiclient',
+ 'python-panko',
'python-pymongo'
] %}
{% endif %}
@@ -35,13 +37,21 @@ MAINTAINER {{ maintainer }}
'/ceilometer[gnocchi,mongo,mysql]'
] %}
+{% set ceilometer_base_plugins_pip_packages = [
+ '/plugins/*'
+] %}
+
ADD ceilometer-base-archive /ceilometer-base-source
+ADD plugins-archive /
RUN ln -s ceilometer-base-source/* ceilometer \
&& {{ macros.install_pip(ceilometer_base_pip_packages | customizable("pip_packages")) }} \
&& mkdir -p /etc/ceilometer \
&& cp -r /ceilometer/etc/ceilometer/* /etc/ceilometer/ \
&& chown -R ceilometer: /etc/ceilometer \
- && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ceilometer/rootwrap.conf
+ && sed -i 's|^exec_dirs.*|exec_dirs=/var/lib/kolla/venv/bin,/sbin,/usr/sbin,/bin,/usr/bin,/usr/local/bin,/usr/local/sbin|g' /etc/ceilometer/rootwrap.conf \
+ && if [ "$(ls /plugins)" ]; then \
+ {{ macros.install_pip(ceilometer_base_plugins_pip_packages) }}; \
+ fi
{% endif %}