From 6f15428e7565736ab600f4f0f01e1445987cc3a6 Mon Sep 17 00:00:00 2001
From: David Sullivan <david.sullivan@windriver.com>
Date: Thu, 6 May 2021 10:12:44 -0500
Subject: [PATCH] Add logging to secured-etcd upgrade script

Add logs to 70-active-secured-etcd-after-upgrade.sh. Redirect ansible logs to a named file under
/root.

Closes-Bug: 1927511
Signed-off-by: David Sullivan <david.sullivan@windriver.com>
Change-Id: I86fd964cad02ebb8eeb8645fc9dea71a3251aef7
---
 .../70-active-secured-etcd-after-upgrade.sh       | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/controllerconfig/controllerconfig/upgrade-scripts/70-active-secured-etcd-after-upgrade.sh b/controllerconfig/controllerconfig/upgrade-scripts/70-active-secured-etcd-after-upgrade.sh
index a09a6488b9..660ee3c9df 100644
--- a/controllerconfig/controllerconfig/upgrade-scripts/70-active-secured-etcd-after-upgrade.sh
+++ b/controllerconfig/controllerconfig/upgrade-scripts/70-active-secured-etcd-after-upgrade.sh
@@ -15,6 +15,10 @@ FROM_REL=$1
 TO_REL=$2
 ACTION=$3
 
+function log {
+    logger -p local1.info $1
+}
+
 # below function is cloned from ../scripts/controller_config
 get_ip()
 {
@@ -49,8 +53,8 @@ enable_secured_etcd()
     SYSTEM_YAML="/opt/platform/puppet/${sw_version}/hieradata/system.yaml"
 
     if [[ ! -f ${STATIC_YAML} ]] || [[ ! -f ${SYSTEM_YAML} ]]; then
-        echo "Could not find specific static/system yaml files in "\
-             "/opt/platform/puppet/${sw_version}/hieradata!"
+        log "Could not find specific static/system yaml files in \
+            /opt/platform/puppet/${sw_version}/hieradata!"
         exit 1
     fi
 
@@ -60,6 +64,7 @@ enable_secured_etcd()
     HOST_ADDR=$(get_ip $(hostname))
 
     if [ "$ETCD_SEC_ENABLED" != "true" ]; then
+        ANSIBLE_LOG_PATH=/root/enable_secured_etcd.log \
         ansible-playbook /usr/share/ansible/stx-ansible/playbooks/enable_secured_etcd.yml \
             -e "cluster_floating_address=${CLUSTER_HOST_ADDRESS}" \
             -e "etcd_listen_address_version=${CLUSTER_HOST_ADDRESS_VERSION}" \
@@ -69,18 +74,16 @@ enable_secured_etcd()
             -e "k8s_root_ca_cert=''" \
             -e "k8s_root_ca_key=''"
         if [ $? -ne 0 ]; then
-            echo "Failed to run ansible playbook!"
+            log "Failed to run ansible playbook!"
             exit 1
         fi
     fi
 }
 
-echo "${0} invoked with from_release = ${FROM_REL} to_release = ${TO_REL} action = ${ACTION}"
+log "${0} invoked with from_release = ${FROM_REL} to_release = ${TO_REL} action = ${ACTION}"
 
 if [ ${FROM_REL} == "20.06" -a ${ACTION} == "activate" ]; then
     enable_secured_etcd
-else
-    echo "Only execute this upgrade code when the activate action is being done and the from release is 20.06!"
 fi
 
 exit 0