openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Sync undercloud stackrc w/ instack 

This adds some extra parameters that we now set in instack-undercloud's
stackrc. Some of which are required for the latest keystone v3
support.

Change-Id: I7043d105ce8312656cb3f2ef23cfaded62c9cf83
Closes-bug: #1718991
This commit is contained in:
Dan Prince 2017-09-22 14:28:19 -04:00
parent 420126fd98
commit 5a400f8011
1 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
extraconfig/post_deploy/undercloud_post.sh
View File

@ -3,22 +3,36 @@ set -eux
ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml ln -sf /etc/puppet/hiera.yaml /etc/hiera.yaml
# WRITE OUT STACKRC # WRITE OUT STACKRC
if [ ! -e /root/stackrc ]; then if [ ! -e /root/stackrc ]; then
touch /root/stackrc touch /root/stackrc
chmod 0600 /root/stackrc chmod 0600 /root/stackrc
cat >> /root/stackrc <<-EOF_CAT cat > /root/stackrc <<-EOF_CAT
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
export OS_USERNAME=admin export OS_USERNAME=admin
export OS_TENANT_NAME=admin export OS_TENANT_NAME=admin
export COMPUTE_API_VERSION=1.1 export COMPUTE_API_VERSION=1.1
export NOVA_VERSION=1.1 export NOVA_VERSION=1.1
export OS_BAREMETAL_API_VERSION=1.15
export OS_NO_CACHE=True export OS_NO_CACHE=True
export OS_CLOUDNAME=undercloud export OS_CLOUDNAME=undercloud
# 1.34 is the latest API version in Ironic Pike supported by ironicclient
export IRONIC_API_VERSION=1.34
export OS_BAREMETAL_API_VERSION=\$IRONIC_API_VERSION
export OS_IDENTITY_API_VERSION='3'
export OS_PROJECT_DOMAIN_NAME='Default'
export OS_USER_DOMAIN_NAME='Default'
EOF_CAT
cat >> /root/stackrc <<-"EOF_CAT"
# Add OS_CLOUDNAME to PS1
if [ -z "${CLOUDPROMPT_ENABLED:-}" ]; then
export PS1=${PS1:-""}
export PS1=\${OS_CLOUDNAME:+"(\$OS_CLOUDNAME)"}\ $PS1
export CLOUDPROMPT_ENABLED=1
fi
EOF_CAT EOF_CAT
if [ -n "$ssl_certificate" ]; then if [ -n "$ssl_certificate" ]; then