summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPep TurrĂ³ Mauri <pep@redhat.com>2017-04-25 11:18:14 +0200
committerPep TurrĂ³ Mauri <pep@redhat.com>2017-04-25 12:56:40 +0200
commit57d0e5d8f3762b184e045a19e3834f0831d92863 (patch)
tree764191f742103e4f6be08ee17a4b5faef595833c
parent9a2770bdafcb3df6863ff132e0a7e5b4c48a1a24 (diff)
downloadopenshift-57d0e5d8f3762b184e045a19e3834f0831d92863.tar.gz
openshift-57d0e5d8f3762b184e045a19e3834f0831d92863.tar.bz2
openshift-57d0e5d8f3762b184e045a19e3834f0831d92863.tar.xz
openshift-57d0e5d8f3762b184e045a19e3834f0831d92863.zip
Add python-boto requirement
The AWS inventory (inventory/aws/hosts/ec2.py) uses the Boto library.
-rw-r--r--Dockerfile.rhel73
-rw-r--r--requirements.txt1
2 files changed, 3 insertions, 1 deletions
diff --git a/Dockerfile.rhel7 b/Dockerfile.rhel7
index 0d5a6038a..c5a95f586 100644
--- a/Dockerfile.rhel7
+++ b/Dockerfile.rhel7
@@ -20,9 +20,10 @@ LABEL name="openshift3/openshift-ansible" \
# because all content and dependencies (like 'oc') is already
# installed via yum.
USER root
-RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients" && \
+RUN INSTALL_PKGS="atomic-openshift-utils atomic-openshift-clients python-boto" && \
yum repolist > /dev/null && \
yum-config-manager --enable rhel-7-server-ose-3.4-rpms && \
+ yum-config-manager --enable rhel-7-server-rh-common-rpms && \
yum install -y $INSTALL_PKGS && \
yum clean all
diff --git a/requirements.txt b/requirements.txt
index d00de5ed4..1996a967d 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,6 +1,7 @@
# Versions are pinned to prevent pypi releases arbitrarily breaking
# tests with new APIs/semantics. We want to update versions deliberately.
ansible==2.2.2.0
+boto==2.45.0
click==6.7
pyOpenSSL==16.2.0
# We need to disable ruamel.yaml for now because of test failures