From b13e8ec3158b5cbeffcfe2fbc9810d531fd1109d Mon Sep 17 00:00:00 2001
From: Alex Schultz <aschultz@redhat.com>
Date: Tue, 12 Mar 2019 13:51:38 -0600
Subject: [PATCH] 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
---
 docker/ironic/ironic-conductor/Dockerfile.j2 | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 811a8102dc..b24ab79db0 100644
--- a/docker/ironic/ironic-conductor/Dockerfile.j2
+++ b/docker/ironic/ironic-conductor/Dockerfile.j2
@@ -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',