summaryrefslogtreecommitdiffstats
path: root/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-14 17:11:58 -0400
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-14 17:11:58 -0400
commitd56b342bc5a4279c0c97c5bfd425251c1ced7c7a (patch)
tree2f35559d78d8854acb28cf0bc69fbcb4bf592649 /playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
parent23460f961b1a26ed71a5738758088572c4bc6d5e (diff)
parent35b2eceb3dea541f704b6c8611bf26f6b76e4372 (diff)
downloadopenshift-d56b342bc5a4279c0c97c5bfd425251c1ced7c7a.tar.gz
openshift-d56b342bc5a4279c0c97c5bfd425251c1ced7c7a.tar.bz2
openshift-d56b342bc5a4279c0c97c5bfd425251c1ced7c7a.tar.xz
openshift-d56b342bc5a4279c0c97c5bfd425251c1ced7c7a.zip
Merge pull request #1599 from brenton/bz1315564
Bug 1315564 - Containerized installs require a running environment
Diffstat (limited to 'playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh')
-rw-r--r--playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh4
1 files changed, 2 insertions, 2 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 da6bcd23c..7a1edf38f 100644
--- a/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
+++ b/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
@@ -4,7 +4,7 @@
# We just need to know the version of one of them.
unit_file=$(ls /etc/systemd/system/${1}*.service | head -n1)
installed_container_name=$(basename -s .service ${unit_file})
-installed=$(docker exec ${installed_container_name} openshift version | grep openshift | awk '{ print $2 }' | cut -f1 -d"-" | tr -d 'v')
+installed=$(docker exec ${installed_container_name} openshift version 2> /dev/null | grep openshift | awk '{ print $2 }' | cut -f1 -d"-" | tr -d 'v')
if [ ${1} == "origin" ]; then
image_name="openshift/origin"
@@ -15,7 +15,7 @@ elif grep openshift3 $unit_file 2>&1 > /dev/null; then
fi
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')
+available=$(docker run --rm ${image_name} version 2> /dev/null | grep openshift | awk '{ print $2 }' | cut -f1 -d"-" | tr -d 'v')
echo "---"
echo "curr_version: ${installed}"