OCP build: fix bug 1465724

https://bugzilla.redhat.com/show_bug.cgi?id=1465724
Use the provided ansible.cfg and hack needed python system libs into SCL

1 files changed, 8 insertions, 2 deletions

diff --git a/images/installer/Dockerfile.rhel7 b/images/installer/Dockerfile.rhel7
index 10eaf9066..2f684dc47 100644
--- a/images/installer/Dockerfile.rhel7
+++ b/images/installer/Dockerfile.rhel7
@@ -11,7 +11,7 @@ LABEL name="openshift3/ose-ansible" \
       io.openshift.expose-services="" \
       io.openshift.tags="openshift,install,upgrade,ansible" \
       com.redhat.component="aos3-installation-docker" \
-      version="v3.4.1" \
+      version="v3.6.0" \
       release="1" \
       architecture="x86_64"
 
@@ -22,11 +22,16 @@ LABEL name="openshift3/ose-ansible" \
 USER root
 RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto skopeo openssl java-1.8.0-openjdk-headless httpd-tools" && \
     yum repolist > /dev/null && \
-    yum-config-manager --enable rhel-7-server-ose-3.4-rpms && \
+    yum-config-manager --enable rhel-7-server-ose-3.6-rpms && \
     yum-config-manager --enable rhel-7-server-rh-common-rpms && \
     yum install -y $INSTALL_PKGS && \
     yum clean all
 
+# The symlinks below are a (hopefully temporary) hack to work around the fact that this
+# image is based on python s2i which uses the python27 SCL instead of system python,
+# and so the system python modules we need would otherwise not be in the path.
+RUN ln -s /usr/lib/python2.7/site-packages/{boto,passlib} /opt/app-root/lib64/python2.7/
+
 USER ${USER_UID}
 
 # The playbook to be run is specified via the PLAYBOOK_FILE env var.
@@ -36,6 +41,7 @@ USER ${USER_UID}
 # $APP_HOME by the 'assemble' script, we set the WORK_DIR env var to the
 # location of openshift-ansible.
 ENV PLAYBOOK_FILE=playbooks/byo/openshift_facts.yml \
+    ANSIBLE_CONFIG=/usr/share/atomic-openshift-utils/ansible.cfg \
     WORK_DIR=/usr/share/ansible/openshift-ansible \
     OPTS="-v"