diff options
| -rw-r--r-- | docker/ceilometer/ceilometer-compute/Dockerfile.j2 | 2 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 | ||||
| -rw-r--r-- | test-requirements.txt | 1 |
3 files changed, 0 insertions, 6 deletions
diff --git a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 index 1de43c9ca..f4b44b328 100644 --- a/docker/ceilometer/ceilometer-compute/Dockerfile.j2 +++ b/docker/ceilometer/ceilometer-compute/Dockerfile.j2 @@ -9,12 +9,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} {% set ceilometer_compute_packages = [ 'openstack-ceilometer-compute', - 'python-ceilometerclient' ] %} {% elif base_distro in ['debian', 'ubuntu'] %} {% set ceilometer_compute_packages = [ 'ceilometer-agent-compute', - 'python-ceilometerclient', 'python-libvirt' ] %} {% endif %} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index b6083594a..dc50b2ec5 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -74,7 +74,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-barbicanclient', 'python-beaker', 'python-cachetools', - 'python-ceilometerclient', 'python-cffi', 'python-cliff', 'python-cloudkittyclient', @@ -176,7 +175,6 @@ ENV DEBIAN_FRONTEND noninteractive 'patch', 'python-aodhclient', 'python-barbicanclient', - 'python-ceilometerclient', 'python-congressclient', 'python-designateclient', 'python-elasticsearch', @@ -354,7 +352,6 @@ RUN curl https://bootstrap.pypa.io/get-pip.py -o get-pip.py \ 'pyngus', 'pyparsing', 'python-barbicanclient', - 'python-ceilometerclient', 'python-cinderclient', 'python-cloudkittyclient', 'python-congressclient', diff --git a/test-requirements.txt b/test-requirements.txt index c0e0cd688..2337b3ff3 100644 --- a/test-requirements.txt +++ b/test-requirements.txt @@ -17,7 +17,6 @@ reno>=2.5.0 # Apache-2.0 PrettyTable<0.8,>=0.7.1 # BSD PyYAML>=3.10 # MIT python-barbicanclient!=4.5.0,!=4.5.1,>=4.0.0 # Apache-2.0 -python-ceilometerclient>=2.5.0 # Apache-2.0 python-heatclient>=1.10.0 # Apache-2.0 python-neutronclient>=6.3.0 # Apache-2.0 python-openstackclient>=3.12.0 # Apache-2.0 |