Merge "Drop redundant rpms from nova-base package list"

This commit is contained in:
Zuul 2019-03-20 20:52:27 +00:00 committed by Gerrit Code Review
commit b1199bc515

View File

@ -15,18 +15,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'openvswitch' '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_arch == 'x86_64' %}
{% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] and base_distro_tag.startswith('7') %}
{% set nova_base_packages = nova_base_packages + [ {% set nova_base_packages = nova_base_packages + [