summaryrefslogtreecommitdiff
path: root/docker/ironic
diff options
context:
space:
mode:
authorDmitry Tantsur <divius.inside@gmail.com>2017-12-08 17:56:30 +0100
committerDmitry Tantsur <divius.inside@gmail.com>2017-12-12 08:23:48 +0100
commit450f41aaa304035ed826422eab3144c4677a0ac9 (patch)
treeecdb8d2bc7d15b5b989031c042304b50fe89fe4a /docker/ironic
parent2d1339b60efbc2afc79acedadfc0619af26ff882 (diff)
downloadkolla-450f41aaa304035ed826422eab3144c4677a0ac9.tar.gz
kolla-450f41aaa304035ed826422eab3144c4677a0ac9.zip
ironic-conductor: update driver dependencies for Queens
* Added python-sushy for CentOS/RHEL for the redfish driver (introduced in the Pike release). * Added ansible and systemd-python for ansible driver (introduced in the Queens cycle). * Added python-scciclient as it was packaged for CentOS/RHEL. * Removed seamicroclient, pyghmi and pyremotevbox as the corresponding drivers were removed. * Removed wsman as no drivers use it any more: the AMT driver was removed, the iDrac driver switched to python-dracclient. Most of removals happened as part of the Ocata driver cleanup: https://docs.openstack.org/releasenotes/ironic/ocata.html#id9 Change-Id: I8774a45bb1cfcdf5c3b675e235fb074af4a9646c
Diffstat (limited to 'docker/ironic')
-rw-r--r--docker/ironic/ironic-conductor/Dockerfile.j216
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',