From 0acc40d36b92b5e9a837d24a63a59b96e5cd31a4 Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Thu, 8 Mar 2018 20:58:15 +0100
Subject: [PATCH] undercloud_post: override stackrc

When upgrading to a containerized undercloud, the stackrc needs to be
overriden so we don't rely on hiera CLI anymore to get the admin
password.

Change-Id: Ie2579bf83d709838557c56d952e61656b84acf31
---
 extraconfig/post_deploy/undercloud_post.sh | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/extraconfig/post_deploy/undercloud_post.sh b/extraconfig/post_deploy/undercloud_post.sh
index e77145931e..f6ac937474 100755
--- a/extraconfig/post_deploy/undercloud_post.sh
+++ b/extraconfig/post_deploy/undercloud_post.sh
@@ -8,11 +8,10 @@ USERNAME=`ls -ld $HOMEDIR | awk {'print $3'}`
 GROUPNAME=`ls -ld $HOMEDIR | awk {'print $4'}`
 
 # WRITE OUT STACKRC
-if [ ! -e $HOMEDIR/stackrc ]; then
-    touch $HOMEDIR/stackrc
-    chmod 0600 $HOMEDIR/stackrc
+touch $HOMEDIR/stackrc
+chmod 0600 $HOMEDIR/stackrc
 
-    cat > $HOMEDIR/stackrc <<-EOF_CAT
+cat > $HOMEDIR/stackrc <<-EOF_CAT
 export OS_AUTH_TYPE=password
 export OS_PASSWORD=$admin_password
 export OS_AUTH_URL=$auth_url
@@ -30,7 +29,7 @@ export OS_PROJECT_DOMAIN_NAME='Default'
 export OS_USER_DOMAIN_NAME='Default'
 EOF_CAT
 
-    cat >> $HOMEDIR/stackrc <<-"EOF_CAT"
+cat >> $HOMEDIR/stackrc <<-"EOF_CAT"
 # Add OS_CLOUDNAME to PS1
 if [ -z "${CLOUDPROMPT_ENABLED:-}" ]; then
     export PS1=${PS1:-""}
@@ -39,11 +38,10 @@ if [ -z "${CLOUDPROMPT_ENABLED:-}" ]; then
 fi
 EOF_CAT
 
-    if [ -n "$ssl_certificate" ]; then
-cat >> $HOMEDIR/stackrc <<-EOF_CAT
+if [ -n "$ssl_certificate" ]; then
+    cat >> $HOMEDIR/stackrc <<-EOF_CAT
 export PYTHONWARNINGS="ignore:Certificate has no, ignore:A true SSLContext object is not available"
 EOF_CAT
-    fi
 fi
 
 chown "$USERNAME:$GROUPNAME" "$HOMEDIR/stackrc"