openstack/tripleo-common
Code Issues Proposed changes

Adds --overcloud-user option to upgrade-non-controller.sh

Browse Source 
There is an existing UPGRADE_NODE_USER environment variable you
can override but this wires that up to the script cli as -U or
--overcloud-user. This is especially useful for split stack
environments where the default overcloud admin user is 'stack'
and not 'heat-admin'.

Closes-Bug: 1724550
Change-Id: Idb8f87119028480df49bd3ee8cc8e6ddd599fc72
This commit is contained in:
marios 2017-10-17 17:03:33 +03:00 committed by Marios Andreou
parent e9a82e329e
commit 9d56658f23
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
scripts/upgrade-non-controller.sh
View File

@ -31,7 +31,6 @@ UPGRADE_SCRIPT=${UPGRADE_SCRIPT:-/root/tripleo_upgrade_node.sh}
UPGRADE_NODE_USER=${UPGRADE_NODE_USER:-"heat-admin"}
UPGRADE_NODE=""
QUERY_NODE=""
SCRIPT=""
HOSTNAME=""
IP_ADDR=""
@ -43,6 +42,9 @@ function show_options {
echo " -u|--upgrade <nova node> -- nova node name or id or ctlplane IP to upgrade"
echo " -q|--query <nova node> -- check if the node is ACTIVE and tail"
echo " yum.log for any package update info"
echo " -U|--overcloud-user <name> -- the user with which to ssh to the"
echo " target upgrade node - defaults to"
echo " 'heat-admin'"
echo
echo "Invoke the /root/tripleo_upgrade_node.sh script on roles that have"
echo "the 'disable_upgrade_deployment' flag set true and then download and"
@ -65,6 +67,7 @@ function show_options {
echo " upgrade-non-controller.sh --upgrade overcloud-compute-0 "
echo " upgrade-non-controller.sh -u 734eea90-087b-4f12-9cd9-4807da83ea78 "
echo " upgrade-non-controller.sh -u 192.168.24.15 "
echo " upgrade-non-controller.sh -U stack -u 192.168.24.15 "
echo
echo "You can run on multiple nodes in parallel: "
@ -76,7 +79,7 @@ function show_options {
exit $1
}
TEMP=`getopt -o h,u:,q: -l help,upgrade:,query:,script: -n $SCRIPT_NAME -- "$@"`
TEMP=`getopt -o h,u:,q:,U: -l help,upgrade:,query:,overcloud-user: -n $SCRIPT_NAME -- "$@"`
if [ $? != 0 ]; then
echo "Terminating..." >&2
@ -90,8 +93,8 @@ while true ; do
case "$1" in
-h | --help ) show_options 0 >&2;;
-u | --upgrade ) UPGRADE_NODE="$2" ; shift 2 ;;
-s | --script ) SCRIPT="$2"; shift 2 ;;
-q | --query ) QUERY_NODE="$2" ; shift 2 ;;
-U | --overcloud-user ) UPGRADE_NODE_USER="$2"; shift 2;;
-- ) shift ; break ;;
* ) echo "Error: unsupported option $1." ; exit 1 ;;
esac