diff options
| author | Alex Schultz <aschultz@redhat.com> | 2019-03-12 13:51:38 -0600 |
|---|---|---|
| committer | Alex Schultz <aschultz@redhat.com> | 2019-03-13 08:15:38 -0600 |
| commit | b13e8ec3158b5cbeffcfe2fbc9810d531fd1109d (patch) | |
| tree | dabe083b95dcba089d3da14de26fa4f082128b91 /docker | |
| parent | 3e5d8e2653db1c6c28cb428f81cd0bc332c623c3 (diff) | |
| download | kolla-b13e8ec3158b5cbeffcfe2fbc9810d531fd1109d.tar.gz kolla-b13e8ec3158b5cbeffcfe2fbc9810d531fd1109d.zip | |
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
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 811a8102d..b24ab79db 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', |