From 7786f393d67bd978877849467d504f097269f2a4 Mon Sep 17 00:00:00 2001
From: Jeffrey Zhang <zhang.lei.fly@gmail.com>
Date: Thu, 20 Oct 2016 14:37:11 +0800
Subject: [PATCH] Install the packages needed by different ironic drivers

Change-Id: If3f30f58eae31753d34e94d030d1f37d9a1e6c47
Closes-Bug: #1635128
---
 docker/ironic/ironic-conductor/Dockerfile.j2 | 24 ++++++++++++++++++--
 1 file changed, 22 insertions(+), 2 deletions(-)

diff --git a/docker/ironic/ironic-conductor/Dockerfile.j2 b/docker/ironic/ironic-conductor/Dockerfile.j2
index 2ece672b49..e7e160b09f 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")) }}