diff options
| author | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 15:36:01 -0500 |
|---|---|---|
| committer | Brenton Leanhardt <bleanhar@redhat.com> | 2016-03-08 15:36:01 -0500 |
| commit | 39cb08d5049496b11cbf17c01d5f2d10897faa4a (patch) | |
| tree | d191ec3f6266c989bd16eb6264e19c49693bc011 /playbooks/common/openshift-cluster | |
| parent | 1589b11e1a5b7819c092c44a7b313b3eec666b6f (diff) | |
| parent | 913ea7767cb8376dbba596a8fc0fb22ac6c82a67 (diff) | |
| download | openshift-39cb08d5049496b11cbf17c01d5f2d10897faa4a.tar.gz openshift-39cb08d5049496b11cbf17c01d5f2d10897faa4a.tar.bz2 openshift-39cb08d5049496b11cbf17c01d5f2d10897faa4a.tar.xz openshift-39cb08d5049496b11cbf17c01d5f2d10897faa4a.zip | |
Merge pull request #1568 from brenton/bz1315563
Bug 1315563 - stdout IO redirection wasn't working as expected over S…
Diffstat (limited to 'playbooks/common/openshift-cluster')
| -rw-r--r-- | playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh | 6 |
1 files 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 "---" |