Add ironic-staging-drivers to ironic-conductor for RHEL family binary and source based builds.

Change-Id: I1a7533c738edeff4e696e95b9b267c23a78003e9
Closes-Bug: #1796194
This commit is contained in:
Dan Williams 2018-10-05 15:27:58 +01:00
parent 3b6860b0b5
commit b18b6a6d1d
1 changed files with 4 additions and 2 deletions

View File

@ -15,6 +15,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
'gdisk',
'ipmitool',
'openstack-ironic-conductor',
'openstack-ironic-staging-drivers',
'parted',
'psmisc',
'pysnmp',
@ -41,7 +42,7 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %}
{% elif base_distro in ['debian', 'ubuntu'] %}
# TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk,
# ImcSdk package, python-sushy
# ImcSdk package, python-sushy, ironic-staging-drivers
{% set ironic_conductor_packages = [
'ansible',
'bsdmainutils',
@ -93,7 +94,8 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build
{% endif %}
{% set ironic_conductor_pip_packages = [
'-r /ironic/driver-requirements.txt'
'-r /ironic/driver-requirements.txt',
'ironic-staging-drivers',
] %}
RUN {{ macros.install_pip(ironic_conductor_pip_packages | customizable("pip_packages")) }}