diff options
| author | Zuul <zuul@review.opendev.org> | 2021-02-12 19:27:31 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2021-02-12 19:27:31 +0000 |
| commit | 32237518391d3e134be5fb50bb3806e30cfb88f2 (patch) | |
| tree | f4db24a9af65daa372bd50a6c5f732f1745825f8 | |
| parent | 448f472d206ca22f7d3ad61ac0c86b8a588e2e5d (diff) | |
| parent | 2305c12c56cb75dcc31ee128ad8b43f4497c34f3 (diff) | |
| download | kolla-32237518391d3e134be5fb50bb3806e30cfb88f2.tar.gz kolla-32237518391d3e134be5fb50bb3806e30cfb88f2.zip | |
Merge "Remove zaqar client from openstack-base and heat-engine"
| -rw-r--r-- | docker/heat/heat-engine/Dockerfile.j2 | 1 | ||||
| -rw-r--r-- | docker/openstack-base/Dockerfile.j2 | 3 |
2 files changed, 0 insertions, 4 deletions
diff --git a/docker/heat/heat-engine/Dockerfile.j2 b/docker/heat/heat-engine/Dockerfile.j2 index bd558e2a8..41efb0fc9 100644 --- a/docker/heat/heat-engine/Dockerfile.j2 +++ b/docker/heat/heat-engine/Dockerfile.j2 @@ -12,7 +12,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% set heat_engine_packages = [ 'openstack-heat-engine', 'python3-barbicanclient', - 'python3-zaqarclient' ] %} {% elif base_package_type == 'deb' %} {# TODO(mnasiadka): Remove extra clients once bug 1893935 is solved in UCA #} diff --git a/docker/openstack-base/Dockerfile.j2 b/docker/openstack-base/Dockerfile.j2 index 3b236b139..278ad0c88 100644 --- a/docker/openstack-base/Dockerfile.j2 +++ b/docker/openstack-base/Dockerfile.j2 @@ -96,7 +96,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python3-troveclient', 'python3-vitrageclient', 'python3-webob', - 'python3-zaqarclient', 'systemd-sysv' ] %} @@ -139,7 +138,6 @@ ENV DEBIAN_FRONTEND noninteractive 'python3-swiftclient', 'python3-troveclient', 'python3-zake', - 'python3-zaqarclient' ] %} {% endif %} @@ -306,7 +304,6 @@ ENV DEBIAN_FRONTEND noninteractive 'python-swiftclient', 'python-troveclient', 'python-vitrageclient', - 'python-zaqarclient', 'pytz', 'repoze.lru', 'requests', |