summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBrenton Leanhardt <bleanhar@redhat.com>2016-03-09 09:03:29 -0500
committerBrenton Leanhardt <bleanhar@redhat.com>2016-03-09 09:50:06 -0500
commit81f8180aae74f45e652ed935c6978b8a4de0a839 (patch)
tree25347796ac5c5975daff91b573f93b06be7ecedb
parent72fbab29392f7b4697a440f406d6873941086d7d (diff)
downloadopenshift-81f8180aae74f45e652ed935c6978b8a4de0a839.tar.gz
openshift-81f8180aae74f45e652ed935c6978b8a4de0a839.tar.bz2
openshift-81f8180aae74f45e652ed935c6978b8a4de0a839.tar.xz
openshift-81f8180aae74f45e652ed935c6978b8a4de0a839.zip
Bug 1315563 - Upgrade failed to containerized install OSE 3.1 on RHEL
Previously I was greping for 'ose' in the systemd units. That was only working on my machine because my Nodes were also Masters. It's safer to grep for openshift3 since that would be present for Masters or Nodes.
-rw-r--r--playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh2
1 files changed, 1 insertions, 1 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 ba17ca671..da6bcd23c 100644
--- a/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
+++ b/playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh
@@ -10,7 +10,7 @@ if [ ${1} == "origin" ]; then
image_name="openshift/origin"
elif grep aep $unit_file 2>&1 > /dev/null; then
image_name="aep3/aep"
-elif grep ose $unit_file 2>&1 > /dev/null; then
+elif grep openshift3 $unit_file 2>&1 > /dev/null; then
image_name="openshift3/ose"
fi