From 87eec8b00b5ba889361aa9065a7b454a8343593d Mon Sep 17 00:00:00 2001 From: Jon Schlueter Date: Wed, 13 Mar 2019 21:57:53 -0400 Subject: Drop redundant rpms from nova-base package list - openstack-base explictly pulls in python[3]-keystoneclient - openstack-base pulls in python[3]-openstackclient which pulls in python[3]-cinderclient This simplifies the python2/3 cases, and reduces how many times these 2 packages are installed Change-Id: If8eb4dc1c5d5de88a8d9b59920b01d09cb585ebb --- docker/nova/nova-base/Dockerfile.j2 | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'docker') 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 + [ -- cgit v1.2.3