openstack
/
kolla
Code Issues Proposed changes

Use virtual package for ansible 

Rather than specify ansible-python3 or ansible, we can try the virtual
package for the python specific version of ansible.

Change-Id: I246edfaf8cc0ee12852c18c6f9027e48880797a4
This commit is contained in:
Alex Schultz 2019-03-12 13:51:38 -06:00
parent 3e5d8e2653
commit b13e8ec315
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
docker/ironic/ironic-conductor/Dockerfile.j2
View File

@ -9,7 +9,6 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if base_package_type == 'rpm' %}
# TODO(Jeffrey4l): no python-oneviewclient
{% set ironic_conductor_packages = [
'ansible',
'dosfstools',
'e2fsprogs',
'gdisk',
@ -25,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'ansible-python3',
'python3dist\(ansible\)',
'python3-dracclient',
'python3-ironic-inspector-client',
'python3-proliantutils',
@ -36,6 +35,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %}
{% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [
'ansible',
'pysnmp',
'python-UcsSdk',
'python-dracclient',