openstack/kolla
Code Issues Proposed changes

Merge "Use virtual package for ansible"

Browse Source
This commit is contained in:
Zuul 2019-03-21 12:48:49 +00:00 committed by Gerrit Code Review
commit 03eb40bc1b
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' %} {% if base_package_type == 'rpm' %}
# TODO(Jeffrey4l): no python-oneviewclient # TODO(Jeffrey4l): no python-oneviewclient
{% set ironic_conductor_packages = [ {% set ironic_conductor_packages = [
'ansible',
'dosfstools', 'dosfstools',
'e2fsprogs', 'e2fsprogs',
'gdisk', 'gdisk',
@ -25,7 +24,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% if distro_python_version.startswith('3') %} {% if distro_python_version.startswith('3') %}
{% set ironic_conductor_packages = ironic_conductor_packages + [ {% set ironic_conductor_packages = ironic_conductor_packages + [
'ansible-python3', 'python3dist\(ansible\)',
'python3-dracclient', 'python3-dracclient',
'python3-ironic-inspector-client', 'python3-ironic-inspector-client',
'python3-proliantutils', 'python3-proliantutils',
@ -36,6 +35,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
] %} ] %}
{% else %} {% else %}
{% set ironic_conductor_packages = ironic_conductor_packages + [ {% set ironic_conductor_packages = ironic_conductor_packages + [
'ansible',
'pysnmp', 'pysnmp',
'python-UcsSdk', 'python-UcsSdk',
'python-dracclient', 'python-dracclient',