From 913ea7767cb8376dbba596a8fc0fb22ac6c82a67 Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Tue, 8 Mar 2016 14:37:15 -0500 Subject: Bug 1315563 - stdout IO redirection wasn't working as expected over SSH connections Bug 1315563 - Upgrade failed to containerized install OSE 3.1 on RHEL --- .../upgrades/files/openshift_container_versions.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh b/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh index 4095b9829..ba17ca671 100644 --- a/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh +++ b/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh @@ -8,13 +8,13 @@ installed=$(docker exec ${installed_container_name} openshift version | grep ope if [ ${1} == "origin" ]; then image_name="openshift/origin" -elif grep aep $unit_file > /dev/null; then +elif grep aep $unit_file 2>&1 > /dev/null; then image_name="aep3/aep" -elif grep ose $unit_file > /dev/null; then +elif grep ose $unit_file 2>&1 > /dev/null; then image_name="openshift3/ose" fi -docker pull ${image_name} 1>&2 +docker pull ${image_name} 2>&1 > /dev/null available=$(docker run --rm ${image_name} version | grep openshift | awk '{ print $2 }' | cut -f1 -d"-" | tr -d 'v') echo "---" -- cgit v1.2.3