diff options
| author | Jenkins <jenkins@review.openstack.org> | 2016-10-24 11:21:33 +0000 |
|---|---|---|
| committer | Gerrit Code Review <review@openstack.org> | 2016-10-24 11:21:33 +0000 |
| commit | f209dee147a9cdd6928b6d7925f318d8ff6f6419 (patch) | |
| tree | b50f6cd95ff2a67413e7857d43d07456b0103e49 /docker | |
| parent | e3036c33dce3d5ba56ae97b5942e779df010b284 (diff) | |
| parent | 7786f393d67bd978877849467d504f097269f2a4 (diff) | |
| download | kolla-f209dee147a9cdd6928b6d7925f318d8ff6f6419.tar.gz kolla-f209dee147a9cdd6928b6d7925f318d8ff6f6419.zip | |
Merge "Install the packages needed by different ironic drivers"
Diffstat (limited to 'docker')
| -rw-r--r-- | docker/ironic/ironic-conductor/Dockerfile.j2 | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2 index 2ece672b4..e7e160b09 100644 --- a/docker/ironic/ironic-conductor/Dockerfile.j2 +++ b/docker/ironic/ironic-conductor/Dockerfile.j2 @@ -7,6 +7,8 @@ MAINTAINER {{ maintainer }} {% if install_type == 'binary' %} {% if base_distro in ['centos', 'fedora', 'oraclelinux', 'rhel'] %} + # TODO(Jeffrey4l): no python-scciclient, python-oneviewclient, + # python-seamicroclient, pyremotevbox package {% set ironic_conductor_packages = [ 'util-linux', 'openstack-ironic-conductor', @@ -14,9 +16,19 @@ MAINTAINER {{ maintainer }} 'ipmitool', 'parted', 'gdisk', - 'psmisc' + 'psmisc', + 'python-dracclient', + 'python-proliantutils', + 'python-ironic-inspector-client', + 'python-pyghmi', + 'pysnmp', + 'python-UcsSdk', + 'openwsman-python', + 'python2-ImcSdk' ] %} {% elif base_distro in ['ubuntu'] %} + # TODO(jeffrey4l): no python-dracclient, python-oneviewclient, UcsSdk, + # pyremotevbox, ImcSdk package {% set ironic_conductor_packages = [ 'bsdmainutils', 'ironic-conductor', @@ -24,7 +36,14 @@ MAINTAINER {{ maintainer }} 'ipmitool', 'gdisk', 'psmisc', - 'parted' + 'parted', + 'python-proliantutils', + 'python-ironic-inspector-client', + 'python-pyghmi', + 'python-pysnmp4', + 'python-scciclient', + 'python-seamicroclient', + 'python-openwsman' ] %} {% endif %} {% elif install_type == 'source' %} @@ -48,6 +67,7 @@ MAINTAINER {{ maintainer }} 'parted' ] %} {% endif %} +RUN /var/lib/kolla/venv/bin/pip --no-cache-dir install --upgrade -c requirements/upper-constraints.txt -r /ironic/driver-requirements.txt {% endif %} {{ macros.install_packages(ironic_conductor_packages | customizable("packages")) }} |