From 50b9eefd2b6266b29755e37090138096a2aebc31 Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Wed, 17 Feb 2016 13:05:12 -0500
Subject: First past at the upgrade process

---
 .../files/ensure_system_units_have_version.sh      | 52 ++++++++++++++++++++++
 1 file changed, 52 insertions(+)
 create mode 100644 playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh

(limited to 'playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh')

diff --git a/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh b/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh
new file mode 100644
index 000000000..eb51ce6b2
--- /dev/null
+++ b/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh
@@ -0,0 +1,52 @@
+#!/bin/bash
+set -e
+
+SERVICE_TYPE=$1
+DEPLOYMENT_TYPE=$2
+VERSION="v${3}"
+
+add_image_version_to_sysconfig () {
+    unit_name=$2
+    sysconfig_file=/etc/sysconfig/${unit_name}
+
+    if ! grep IMAGE_VERSION ${sysconfig_file}; then
+        sed -i "/CONFIG_FILE/a IMAGE_VERSION=${1}" ${sysconfig_file}
+    else
+        sed -i "s/\(IMAGE_VERSION=\).*/\1${1}/" ${sysconfig_file}
+    fi
+}
+
+add_image_version_to_unit () {
+    deployment_type=$1
+    unit_file=$2
+
+    if ! grep IMAGE_VERSION $unit_file; then
+        image_namespace="openshift/"
+        if [ $deployment_type == "atomic-enterprise" ]; then
+            image_namespace="aep3/"
+        elif [ $deployment_type == "openshift-enterprise" ]; then
+            image_namespace="openshift3/"
+        fi
+
+        sed -i "s|\(${image_namespace}[a-zA-Z0-9]\+\)|\1:\${IMAGE_VERSION}|" $unit_file
+    fi
+}
+
+for unit_file in $(ls /etc/systemd/system/${SERVICE_TYPE}*.service | head -n1); do
+    unit_name=$(basename -s .service ${unit_file})
+    add_image_version_to_sysconfig $VERSION $unit_name
+    add_image_version_to_unit $DEPLOYMENT_TYPE $unit_file
+done
+
+if [ -e /etc/sysconfig/openvswitch ]; then
+    add_image_version_to_sysconfig $VERSION openvswitch
+else
+    # TODO: add this to config.yml
+    echo IMAGE_VERSION=${VERSION} > /etc/sysconfig/openvswitch
+fi 
+if ! grep EnvironmentFile /etc/systemd/system/openvswitch.service > /dev/null; then
+    sed -i "/Service/a EnvironmentFile=/etc/sysconfig/openvswitch" /etc/systemd/system/openvswitch.service
+fi
+add_image_version_to_unit $DEPLOYMENT_TYPE /etc/systemd/system/openvswitch.service
+
+systemctl daemon-reload
-- 
cgit v1.2.3


From 7d561bd252a4ddc9e204f31144fbed7fecd99bff Mon Sep 17 00:00:00 2001
From: Brenton Leanhardt <bleanhar@redhat.com>
Date: Sun, 28 Feb 2016 16:32:38 -0500
Subject: Correctly set the image tag for containerized installs (and upgrades)

---
 .../upgrades/files/ensure_system_units_have_version.sh                 | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh')

diff --git a/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh b/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh
index eb51ce6b2..239f43314 100644
--- a/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh
+++ b/playbooks/common/openshift-cluster/upgrades/files/ensure_system_units_have_version.sh
@@ -32,7 +32,7 @@ add_image_version_to_unit () {
     fi
 }
 
-for unit_file in $(ls /etc/systemd/system/${SERVICE_TYPE}*.service | head -n1); do
+for unit_file in $(ls /etc/systemd/system/${SERVICE_TYPE}*.service); do
     unit_name=$(basename -s .service ${unit_file})
     add_image_version_to_sysconfig $VERSION $unit_name
     add_image_version_to_unit $DEPLOYMENT_TYPE $unit_file
@@ -41,7 +41,6 @@ done
 if [ -e /etc/sysconfig/openvswitch ]; then
     add_image_version_to_sysconfig $VERSION openvswitch
 else
-    # TODO: add this to config.yml
     echo IMAGE_VERSION=${VERSION} > /etc/sysconfig/openvswitch
 fi 
 if ! grep EnvironmentFile /etc/systemd/system/openvswitch.service > /dev/null; then
-- 
cgit v1.2.3