openstack/tripleo-heat-templates
Code Issues Proposed changes

undercloud_post: override stackrc

Browse Source 
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
This commit is contained in:
Emilien Macchi 2018-03-08 20:58:15 +01:00
parent b6c9134c83
commit 0acc40d36b
1 changed files with 6 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
extraconfig/post_deploy/undercloud_post.sh
View File

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