From bb2351a48d4a4acf7ed933094298e27d3b91c315 Mon Sep 17 00:00:00 2001 From: Emilien Macchi Date: Mon, 21 Sep 2020 13:35:27 -0400 Subject: [PATCH] enable-ssh-admin: allow to override plan name By default, the overcloud plan name is "overcloud" but it can be renamed if the stack is named directly. Allowing the operator to override it so they can run that script on a deployment where the stack is named differently than the default. Change-Id: I05029d30447592d4e16d85acc490cda69b101e9c Closes-Bug: #1896505 --- deployed-server/scripts/enable-ssh-admin.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/deployed-server/scripts/enable-ssh-admin.sh b/deployed-server/scripts/enable-ssh-admin.sh index 631a9b50d5..b878d0f339 100755 --- a/deployed-server/scripts/enable-ssh-admin.sh +++ b/deployed-server/scripts/enable-ssh-admin.sh @@ -3,6 +3,7 @@ set -eu # whitespace (space or newline) separated list +OVERCLOUD_PLAN=${OVERCLOUD_PLAN:-"overcloud"} OVERCLOUD_HOSTS=${OVERCLOUD_HOSTS:-""} OVERCLOUD_SSH_USER=${OVERCLOUD_SSH_USER:-"$USER"} # this is just for compatibility with CI @@ -85,7 +86,7 @@ for HOST in $OVERCLOUD_HOSTS; do done echo "Starting ssh admin enablement workflow" -EXECUTION_PARAMS="{\"ssh_user\": \"$OVERCLOUD_SSH_USER\", \"ssh_servers\": $(overcloud_ssh_hosts_json), \"ssh_private_key\": $(overcloud_ssh_key_json "$SHORT_TERM_KEY_PRIVATE")}" +EXECUTION_PARAMS="{\"plan_name\": \"$OVERCLOUD_PLAN\", \"ssh_user\": \"$OVERCLOUD_SSH_USER\", \"ssh_servers\": $(overcloud_ssh_hosts_json), \"ssh_private_key\": $(overcloud_ssh_key_json "$SHORT_TERM_KEY_PRIVATE")}" EXECUTION_CREATE_OUTPUT=$(openstack workflow execution create -f shell -d 'deployed server ssh admin creation' tripleo.access.v1.enable_ssh_admin "$EXECUTION_PARAMS") echo "$EXECUTION_CREATE_OUTPUT" EXECUTION_ID=$(echo "$EXECUTION_CREATE_OUTPUT" | grep '^id=' | awk '-F"' '{ print $2 }')