openstack/kolla
Code Issues Proposed changes

Merge "Install panko in ceilometer base container"

Browse Source
This commit is contained in:
Jenkins 2017-04-12 11:28:21 +00:00 committed by Gerrit Code Review
commit c8675119c3
2 changed files with 15 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
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-oslo-db',
'python-pecan',
@ -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 %}

4
kolla/common/config.py
View File

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