diff options
| author | Zuul <zuul@review.openstack.org> | 2019-03-20 20:52:27 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2019-03-20 20:52:27 +0000 |
| commit | b1199bc5150617e68c89eec2979280fb0bc722cd (patch) | |
| tree | a4c2dfcb44bfaf2ae55ee9aa121bfbd10f112cad /docker/nova | |
| parent | 75ad4d3aa198aaed3cb205076abf17847df55e5d (diff) | |
| parent | 87eec8b00b5ba889361aa9065a7b454a8343593d (diff) | |
| download | kolla-b1199bc5150617e68c89eec2979280fb0bc722cd.tar.gz kolla-b1199bc5150617e68c89eec2979280fb0bc722cd.zip | |
Merge "Drop redundant rpms from nova-base package list"
Diffstat (limited to 'docker/nova')
| -rw-r--r-- | docker/nova/nova-base/Dockerfile.j2 | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/docker/nova/nova-base/Dockerfile.j2 b/docker/nova/nova-base/Dockerfile.j2 index f64664f65..7516e5ce6 100644 --- a/docker/nova/nova-base/Dockerfile.j2 +++ b/docker/nova/nova-base/Dockerfile.j2 @@ -15,18 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'openvswitch' ] %} - {% if distro_python_version.startswith('3') %} - {% set nova_base_packages = nova_base_packages + [ - 'python3-cinderclient', - 'python3-keystoneclient' - ] %} - {% else %} - {% set nova_base_packages = nova_base_packages + [ - 'python-cinderclient', - 'python-keystoneclient' - ] %} - {% endif %} - {% if base_arch == 'x86_64' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} {% set nova_base_packages = nova_base_packages + [ |