From 7d561bd252a4ddc9e204f31144fbed7fecd99bff Mon Sep 17 00:00:00 2001 From: Brenton Leanhardt Date: Sun, 28 Feb 2016 16:32:38 -0500 Subject: Correctly set the image tag for containerized installs (and upgrades) --- .../openshift-cluster/upgrades/files/rpm_versions.sh | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) (limited to 'playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh') diff --git a/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh b/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh index e06f7958f..a2a9579b5 100644 --- a/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh +++ b/playbooks/common/openshift-cluster/upgrades/files/rpm_versions.sh @@ -1,23 +1,7 @@ #!/bin/bash -while getopts ":c" opt; do - case $opt in - c) - echo "-c was triggered!" >&2 - containerized="TRUE" - ;; - \?) - echo "Invalid option: -$OPTARG" >&2 - ;; - esac -done - -if [ "${containerized}" == "TRUE" ] ; then - docker exec atomic-openshift-master rpm -q atomic-openshift -else - installed=$(yum list installed -e 0 -q "$@" 2>&1 | tail -n +2 | awk '{ print $2 }' | sort -r | tr '\n' ' ') - available=$(yum list available -e 0 -q "$@" 2>&1 | tail -n +2 | grep -v 'el7ose' | awk '{ print $2 }' | sort -r | tr '\n' ' ') -fi +installed=$(yum list installed -e 0 -q "$@" 2>&1 | tail -n +2 | awk '{ print $2 }' | sort -r | tr '\n' ' ') +available=$(yum list available -e 0 -q "$@" 2>&1 | tail -n +2 | grep -v 'el7ose' | awk '{ print $2 }' | sort -r | tr '\n' ' ') echo "---" echo "curr_version: ${installed}" -- cgit v1.2.3