openstack/kolla
Code Issues Proposed changes

Merge "Fix missing python modules in Ceilometer"

Browse Source
This commit is contained in:
Jenkins 2017-03-07 04:47:16 +00:00 committed by Gerrit Code Review
commit 18fe77689b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -9,11 +9,15 @@ MAINTAINER {{ maintainer }}
{% if install_type == 'binary' %} {% if install_type == 'binary' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %}
# TODO(duonghq) remove 2 last packages when RDO fix is merged
# https://review.rdoproject.org/r/#/c/5633/
{% set ceilometer_base_packages = [ {% set ceilometer_base_packages = [
'openstack-ceilometer-common', 'openstack-ceilometer-common',
'python-gnocchiclient', 'python-gnocchiclient',
'python-tooz', 'python-tooz',
'python-oslo-db' 'python-oslo-db',
'python-pecan',
'python-wsme'
] %} ] %}
{% elif base_distro in ['ubuntu'] %} {% elif base_distro in ['ubuntu'] %}
{% set ceilometer_base_packages = [ {% set ceilometer_base_packages = [