openstack
/
kolla
Code Issues Proposed changes

Install panko in ceilometer base container 

When using panko event dispather in ceilometer, panko's code is
required.

Closes-Bug: #1672241
Change-Id: Ie03f6fcda0ecd09511c09c962b9bd14ae67f1ad3
(cherry picked from commit 5558bd53fb)
This commit is contained in:
Jeffrey Zhang 2017-03-13 00:05:27 +08:00
parent fb7c1073bd
commit c69c3e5fec
2 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
docker/ceilometer/ceilometer-base/Dockerfile.j2
View File

@ -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 %}
@ -32,12 +34,16 @@ MAINTAINER {{ maintainer }}
{% elif install_type == 'source' %}
ADD ceilometer-base-archive /ceilometer-base-source
ADD plugins-archive /
RUN ln -s ceilometer-base-source/* ceilometer \
&& /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /ceilometer[gnocchi,mongo,mysql] \
&& 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 \
pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt /plugins/*; \
fi
{% endif %}

4
kolla/common/config.py
View File

@ -252,6 +252,10 @@ SOURCES = {
'type': 'url',
'location': ('$tarballs_base/ceilometer/'
'ceilometer-8.0.1.tar.gz')},
'ceilometer-base-plugin-panko': {
'type': 'url',
'location': ('$tarballs_base/panko/'
'panko-2.0.1.tar.gz')},
'cinder-base': {
'type': 'url',
'location': ('$tarballs_base/cinder/'