From 310b557430a7dc6fbf6db892fde7fd4ad7ce6a58 Mon Sep 17 00:00:00 2001 From: Steven Hardy Date: Thu, 5 Mar 2015 15:37:05 -0500 Subject: [PATCH] Fall back to generated snmp password with --no-undercloud Running devtest_overcloud.sh via devtest with --no-undercloud seems to result in some puppet errors recently, due to the zero-length password in the heiradata key. So instead of passing a zero length password, fall back to generating one in the event no password is found via the undercloud key of the test environment. Change-Id: Ia5f9fff1ea3b50f372489a42647e3f47bc219df8 Closes-Bug: #1428726 --- scripts/devtest_overcloud.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/scripts/devtest_overcloud.sh b/scripts/devtest_overcloud.sh index c63f6619..2fc4fb09 100755 --- a/scripts/devtest_overcloud.sh +++ b/scripts/devtest_overcloud.sh @@ -337,6 +337,9 @@ wait_for -w $((60 * $expected_nodes)) --delay 10 -- wait_for_hypervisor_stats $e ## #. Set password for Overcloud SNMPd, same password needs to be set in Undercloud Ceilometer UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD=$(os-apply-config -m $TE_DATAFILE --key undercloud.ceilometer_snmpd_password --type raw --key-default '') +if [ -z "$UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD" ]; then #nodocs + UNDERCLOUD_CEILOMETER_SNMPD_PASSWORD=$(os-make-password) +fi #nodocs ## #. Create unique credentials::