diff options
| author | Zuul <zuul@review.openstack.org> | 2017-12-13 15:01:47 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2017-12-13 15:01:47 +0000 |
| commit | 7ac77d9daa5917132b1c8a63bfe3daf2803e7469 (patch) | |
| tree | 74424d12f5ce5437745de04bda52fa3f484311ff | |
| parent | abbc589e6aab7806be8be2d26d610ffb586063eb (diff) | |
| parent | 450f41aaa304035ed826422eab3144c4677a0ac9 (diff) | |
| download | kolla-7ac77d9daa5917132b1c8a63bfe3daf2803e7469.tar.gz kolla-7ac77d9daa5917132b1c8a63bfe3daf2803e7469.zip | |
Merge "ironic-conductor: update driver dependencies for Queens"
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 3fce16017..e19cecdad 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -7,15 +7,14 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build {% if install_type == 'binary' %} {% if base_distro in ['centos', 'oraclelinux', 'rhel'] %} - # TODO(Jeffrey4l): no python-scciclient, python-oneviewclient, - # python-seamicroclient, pyremotevbox package + # TODO(Jeffrey4l): no python-oneviewclient {% set ironic_conductor_packages = [ + 'ansible', 'dosfstools', 'e2fsprogs', 'gdisk', 'ipmitool', 'openstack-ironic-conductor', - 'openwsman-python', 'parted', 'psmisc', 'pysnmp', @@ -23,18 +22,21 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'python-dracclient', 'python-ironic-inspector-client', 'python-proliantutils', - 'python-pyghmi', + 'python-scciclient', + 'python-sushy', 'python-UcsSdk', 'qemu-img', 'shellinabox', 'socat', + 'systemd-python', 'util-linux', 'xfsprogs', ] %} {% elif base_distro in ['debian', 'ubuntu'] %} # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, - # pyremotevbox, ImcSdk package + # ImcSdk package, python-sushy {% set ironic_conductor_packages = [ + 'ansible', 'bsdmainutils', 'dosfstools', 'e2fsprogs', @@ -44,12 +46,10 @@ LABEL maintainer="{{ maintainer }}" name="{{ image_name }}" build-date="{{ build 'parted', 'psmisc', 'python-ironic-inspector-client', - 'python-openwsman', 'python-proliantutils', - 'python-pyghmi', 'python-pysnmp4', 'python-scciclient', - 'python-seamicroclient', + 'python-systemd', 'qemu-utils', 'shellinabox', 'socat', |