diff options
| author | Dan Williams <dw@adventsol.co.uk> | 2018-10-05 15:27:58 +0100 |
|---|---|---|
| committer | Dan Williams <dw@adventsol.co.uk> | 2018-10-05 15:27:58 +0100 |
| commit | b18b6a6d1d7dbf499563b728658f89fcb5c9b02c (patch) | |
| tree | e776bd959bc5dadc08c9ec884536f62b782b6872 /docker | |
| parent | 3b6860b0b57d34aedc9ba29936473e9028f02aed (diff) | |
| download | kolla-b18b6a6d1d7dbf499563b728658f89fcb5c9b02c.tar.gz kolla-b18b6a6d1d7dbf499563b728658f89fcb5c9b02c.zip | |
Add ironic-staging-drivers to ironic-conductor for RHEL family binary and source based builds.
Change-Id: I1a7533c738edeff4e696e95b9b267c23a78003e9
Closes-Bug: #1796194
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 36be871ec..c094835a2 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -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")) }} |