diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-04-28 04:15:11 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-04-28 04:15:11 -0500 |
| commit | 6dc8ed746d44c03d0560aa10e0796ad9a1278b91 (patch) | |
| tree | c7d247bd02904698bbba892ee577fb55267566aa | |
| parent | 58b1799986e7a41cc4e987dabcefa816a286b203 (diff) | |
| parent | 57d0e5d8f3762b184e045a19e3834f0831d92863 (diff) | |
| download | openshift-6dc8ed746d44c03d0560aa10e0796ad9a1278b91.tar.gz openshift-6dc8ed746d44c03d0560aa10e0796ad9a1278b91.tar.bz2 openshift-6dc8ed746d44c03d0560aa10e0796ad9a1278b91.tar.xz openshift-6dc8ed746d44c03d0560aa10e0796ad9a1278b91.zip | |
Merge pull request #3994 from codificat/boto-requirement
Merged by openshift-bot
| -rw-r--r-- | Dockerfile.rhel7 | 3 | ||||
| -rw-r--r-- | requirements.txt | 1 |
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 |