From c21d9d873cf0ad1de571f2c24e8619866c4296a9 Mon Sep 17 00:00:00 2001 From: Remigiusz Janeczek Date: Tue, 29 Sep 2020 16:17:59 +0200 Subject: Move Cloudify's password update and plugins upload to start-persistent.sh script Move logic for changing cloudify's admin password and plugin upload to main script for debug purposes, so that output of those scripts is printed to stdout (can be accessed by 'docker/kubernetes logs') Issue-ID: DCAEGEN2-2457 Signed-off-by: Remigiusz Janeczek Change-Id: I69fb0b428efbfb3d85eba286ed6816151e03a0f1 --- cm-container/scripts/set-admin-password.sh | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) (limited to 'cm-container/scripts/set-admin-password.sh') diff --git a/cm-container/scripts/set-admin-password.sh b/cm-container/scripts/set-admin-password.sh index 5b9ca27..d8c4121 100755 --- a/cm-container/scripts/set-admin-password.sh +++ b/cm-container/scripts/set-admin-password.sh @@ -16,6 +16,8 @@ # ============LICENSE_END========================================================= # Runs at deployment time to set cloudify's admin password +set -x + # Wait for Cloudify Manager to come up while ! /scripts/cloudify-ready.sh do @@ -23,17 +25,19 @@ do sleep 15 done +set +x + # Expect Cloudify password to be in file mounted from Kubernetes secret, # but allow overriding by CMPASS environment variable, # and if not provided, use the default CMPASS=${CMPASS:-$(cat /opt/onap/cm-secrets/password 2>/dev/null)} CMPASS=${CMPASS:-admin} -# Set Cloudify's admin password +echo "Set Cloudify's admin password" cd /opt/manager cfy_manager --reset_admin_password $CMPASS || ./env/bin/python reset_admin.py -p $CMPASS -# Set the password used by the cfy client +echo "Set the password used by the cfy client" cfy profile set -p $CMPASS echo "Cloudify password set" -- cgit 1.2.3-korg