From c1bbf1537c4a1e5520fe586acbb033b82f0aab4a Mon Sep 17 00:00:00 2001
From: Gorka Eguileor <geguileo@redhat.com>
Date: Thu, 31 Jan 2019 11:22:08 +0100
Subject: [PATCH] Add driver dependencies to containers

We already had dependencies for RBD, Kaminario, and Pure storage in our
containers.

This patch adds requirements for Fujitsu Eternus and IBM XIV:

- pywbem
- pyxcli
- pyOpenSSL
---
 Dockerfile         | 6 +++---
 Dockerfile-latest  | 7 +++----
 Dockerfile-release | 6 +++---
 3 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8aeebc6..21f705b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -7,15 +7,15 @@ LABEL maintainers="Gorka Eguileor <geguileo@redhat.com>" \
       version=${VERSION:-master}
 
 RUN yum -y install targetcli iscsi-initiator-utils device-mapper-multipath epel-release lvm2 which && \
-    yum -y install python2-pip python-devel gcc && \
+    yum -y install python2-pip python-devel gcc openssl-devel pywbem && \
     yum -y install python-rbd ceph-common git && \
     # Need new setuptools version or we'll get "SyntaxError: '<' operator not allowed in environment markers" when installing Cinder
     pip install 'setuptools>=38.6.0' && \
     git clone 'https://github.com/openstack/cinder.git' && \
     pip install --no-cache-dir cinder/ && \
-    pip install --no-cache-dir 'krest>=1.3.0' 'purestorage>=1.6.0' && \
+    pip install --no-cache-dir 'krest>=1.3.0' 'purestorage>=1.6.0' 'pyxcli>=1.1.5' 'pyOpenSSL>=1.0.0' && \
     rm -rf cinder && \
-    yum -y remove git python-devel gcc && \
+    yum -y remove git python-devel gcc openssl-devel && \
     yum clean all && \
     rm -rf /var/cache/yum
 
diff --git a/Dockerfile-latest b/Dockerfile-latest
index 7cc2fa3..3a7ece7 100644
--- a/Dockerfile-latest
+++ b/Dockerfile-latest
@@ -7,10 +7,9 @@ LABEL maintainers="Gorka Eguileor <geguileo@redhat.com>" \
       version=${VERSION:-latest}
 
 RUN yum -y install targetcli iscsi-initiator-utils device-mapper-multipath epel-release lvm2 which && \
-    echo yum -y install python2-pip centos-release-openstack-${RELEASE} > /root/whatever && \
-    yum -y install python2-pip centos-release-openstack-${RELEASE} && \
-    yum -y install openstack-cinder python-rbd ceph-common && \
-    pip install --no-cache-dir 'krest>=1.3.0' 'purestorage>=1.6.0' && \
+    yum -y install python2-pip centos-release-openstack-${RELEASE} pywbem && \
+    yum -y install openstack-cinder python-rbd ceph-common python2-pyOpenSSL && \
+    pip install --no-cache-dir 'krest>=1.3.0' 'purestorage>=1.6.0' 'pyxcli>=1.1.5' && \
     yum clean all && \
     rm -rf /var/cache/yum
 
diff --git a/Dockerfile-release b/Dockerfile-release
index 26ec4d0..1792bcc 100644
--- a/Dockerfile-release
+++ b/Dockerfile-release
@@ -7,11 +7,11 @@ LABEL maintainers="Gorka Eguileor <geguileo@redhat.com>" \
       version=${VERSION:-latest}
 
 RUN yum -y install targetcli iscsi-initiator-utils device-mapper-multipath epel-release lvm2 which && \
-    yum -y install python2-pip centos-release-openstack-$RELEASE && \
-    yum -y install openstack-cinder python-rbd ceph-common && \
+    yum -y install python2-pip centos-release-openstack-$RELEASE pywbem && \
+    yum -y install openstack-cinder python-rbd ceph-common python2-pyOpenSSL && \
     yum clean all && \
     rm -rf /var/cache/yum && \
-    pip install --no-cache-dir --process-dependency-links cinderlib 'krest>=1.3.0' 'purestorage>=1.6.0'
+    pip install --no-cache-dir --process-dependency-links cinderlib 'krest>=1.3.0' 'purestorage>=1.6.0' 'pyxcli>=1.1.5'
 
 # Define default command
 CMD ["bash"]