diff options
| author | Jenkins <jenkins@review.openstack.org> | 2017-07-24 15:03:51 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-07-24 15:03:51 +0000 |
| commit | 1e1b49ea5cfa1471da58b0a3161bd43bcaead098 (patch) | |
| tree | 4077340af428c3ad4043b3ae2675d75f280218fc | |
| parent | b370ccf034b02156b9682cdaee2f17b9efc98e4f (diff) | |
| parent | 92ed026c27c52f2235b5359e4dcc2af63462de31 (diff) | |
| download | kolla-1e1b49ea5cfa1471da58b0a3161bd43bcaead098.tar.gz kolla-1e1b49ea5cfa1471da58b0a3161bd43bcaead098.zip | |
Merge "Remove python-wsme and python-pecan packages for centos"
| -rw-r--r-- | docker/ceilometer/ceilometer-base/Dockerfile.j2 | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/docker/ceilometer/ceilometer-base/Dockerfile.j2 b/docker/ceilometer/ceilometer-base/Dockerfile.j2 index 584170a09..4f6a60530 100644 --- a/docker/ceilometer/ceilometer-base/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-base/Dockerfile.j2 @@ -9,16 +9,12 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% 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 = [ 'openstack-ceilometer-common', 'python-panko', 'python-gnocchiclient', 'python-oslo-db', - 'python-pecan', - 'python-tooz', - 'python-wsme' + 'python-tooz' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set ceilometer_base_packages = [ |