Browse Source

Merge "enable-ssh-admin: allow to override plan name" into stable/train

changes/30/754830/1
Zuul 10 months ago
committed by Gerrit Code Review
parent
commit
6d41d30a2c
  1. 3
      deployed-server/scripts/enable-ssh-admin.sh

3
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
@ -86,7 +87,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 }')

Loading…
Cancel
Save