openstack/kolla
Code Issues Proposed changes

Merge "Remove python-wsme and python-pecan packages for centos"

Browse Source
This commit is contained in:
Jenkins 2017-07-24 15:03:51 +00:00 committed by Gerrit Code Review
commit 1e1b49ea5c
1 changed files with 1 additions and 5 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,16 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% 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-panko', 'python-panko',
'python-gnocchiclient', 'python-gnocchiclient',
'python-oslo-db', 'python-oslo-db',
'python-pecan', 'python-tooz'
'python-tooz',
'python-wsme'
] %} ] %}
{% elif base_distro in ['debian', 'ubuntu'] %} {% elif base_distro in ['debian', 'ubuntu'] %}
{% set ceilometer_base_packages = [ {% set ceilometer_base_packages = [