summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.tito/packages/openshift-ansible2
-rw-r--r--openshift-ansible.spec11
-rw-r--r--playbooks/common/openshift-cluster/upgrades/files/openshift_container_versions.sh6
3 files changed, 14 insertions, 5 deletions
diff --git a/.tito/packages/openshift-ansible b/.tito/packages/openshift-ansible
index 4fd980b4d..396f023ef 100644
--- a/.tito/packages/openshift-ansible
+++ b/.tito/packages/openshift-ansible
@@ -1 +1 @@
-3.0.53-1 ./
+3.0.54-1 ./
diff --git a/openshift-ansible.spec b/openshift-ansible.spec
index e249678f1..bf2577d06 100644
--- a/openshift-ansible.spec
+++ b/openshift-ansible.spec
@@ -5,7 +5,7 @@
}
Name: openshift-ansible
-Version: 3.0.53
+Version: 3.0.54
Release: 1%{?dist}
Summary: Openshift and Atomic Enterprise Ansible
License: ASL 2.0
@@ -279,6 +279,15 @@ Atomic OpenShift Utilities includes
%changelog
+* Tue Mar 08 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.54-1
+- Bug 1315563 - stdout IO redirection wasn't working as expected over SSH
+ connections (bleanhar@redhat.com)
+- Bug 1315637 - The docker wasn't upgraded on node during upgrade
+ (bleanhar@redhat.com)
+- Bug 1315564 - upgrade to ose3.2 failed on Atomic Hosts (bleanhar@redhat.com)
+- Fix issue when there are no infra nodes (lhuard@amadeus.com)
+- Stop the etcd container during uninstall (bleanhar@redhat.com)
+
* Mon Mar 07 2016 Brenton Leanhardt <bleanhar@redhat.com> 3.0.53-1
- Don't enable cockpit-ws for containerized installs (bleanhar@redhat.com)
- Support openshift_image_tag (bleanhar@redhat.com)
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 "---"