Browse Source

Docker stderr can break this script if ansible executes it remotely

Brenton Leanhardt 9 years ago
parent
commit
35b2eceb3d

+ 2 - 2
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}"