From 81e2cbc4eed143cebf01ac2a817ae6aae9ab066d Mon Sep 17 00:00:00 2001 From: Jason Madigan Date: Fri, 6 Jul 2018 12:13:35 +0100 Subject: [PATCH] Revert dependency fix --- installer/install.sh | 8 ++++---- installer/requirements.yml | 4 ++-- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/installer/install.sh b/installer/install.sh index 290b05e2..0aa55657 100755 --- a/installer/install.sh +++ b/installer/install.sh @@ -108,17 +108,17 @@ function check_ansible() { command -v ansible &>/dev/null ansible_exists=${?}; if [[ ${ansible_exists} -ne 0 ]]; then - does_not_exist_msg "Ansible" "pip install ansible>=2.3" + does_not_exist_msg "Ansible" "pip install ansible>=2.6" exit 1 fi check_passed_msg "Ansible" readonly ansible_version=$(ansible --version | sed -n '1p' | cut -d " " -f2) - check_version_msg "Ansible" ">= 2.3" - compare_version ${ansible_version} 2.3 + check_version_msg "Ansible" ">= 2.6" + compare_version ${ansible_version} 2.6 ansible_version_comparison=${?}; if [[ ${ansible_version_comparison} -eq ${VER_LT} ]]; then - echo -e "${RED}Ansible version is < 2.3. Install ansible>=2.3 using pip install ansible>=2.3${RESET}" + echo -e "${RED}Ansible version is < 2.6. Install ansible>=2.6 using pip install ansible>=2.6${RESET}" exit 1 fi check_passed_msg "Ansible" diff --git a/installer/requirements.yml b/installer/requirements.yml index 0ef9323a..00b8a037 100644 --- a/installer/requirements.yml +++ b/installer/requirements.yml @@ -1,6 +1,6 @@ -- src: aerogear.ansible_openshift_origin_client_tools +- src: andrewrothstein.openshift-origin-client-tools + version: v1.0.7 name: openshift-origin-client-tools - version: v1.0.3 - src: aerogear.install_socat name: install-socat version: v1.0.0