diff options
| author |   Gary Wu <gary.i.wu@huawei.com> | 2017-11-09 16:48:34 -0800 |
|---|---|---|
| committer | Gary Wu <gary.i.wu@huawei.com> | 2017-11-09 16:48:34 -0800 |
| commit | acf1cb3c8ad58edfa4f53ca18b8cff0668b858dc (patch) | |
| tree | 435b2ba8e95b3954b05e050c89c31b366146a1a3 | |
| parent | e1a036492494c1097dbebb42fa4378bd4b10f3ec (diff) | |
No longer hard-code OpenStack username per env
Change-Id: Icce527ecaf48b12db08e1f010dcf963924037b0f
Issue-ID: INT-278
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>
| -rw-r--r-- | test/ete/labs/windriver/Integration-Jenkins-openrc.sh | 5 | ||||
| -rw-r--r-- | test/ete/labs/windriver/Integration-SB-04-openrc.sh | 7 |
2 files changed, 10 insertions, 2 deletions
diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh index 6c8e2af83..feec97d33 100644 --- a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh +++ b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh @@ -26,7 +26,10 @@ unset OS_TENANT_NAME # In addition to the owning entity (tenant), OpenStack stores the entity # performing the action as the **user**. -export OS_USERNAME="gary_wu" +if [ -z ${OS_USERNAME_INPUT+x} ]; then + read -sp "Please enter your OpenStack Username for project $OS_PROJECT_NAME: " OS_USERNAME_INPUT +fi +export OS_USERNAME=OS_USERNAME_INPUT # With Keystone you pass the keystone password. if [ -z ${OS_PASSWORD_INPUT+x} ]; then diff --git a/test/ete/labs/windriver/Integration-SB-04-openrc.sh b/test/ete/labs/windriver/Integration-SB-04-openrc.sh index c7e650150..52eb4df31 100644 --- a/test/ete/labs/windriver/Integration-SB-04-openrc.sh +++ b/test/ete/labs/windriver/Integration-SB-04-openrc.sh @@ -26,7 +26,12 @@ unset OS_TENANT_NAME # In addition to the owning entity (tenant), OpenStack stores the entity # performing the action as the **user**. -export OS_USERNAME="demo" +# In addition to the owning entity (tenant), OpenStack stores the entity +# performing the action as the **user**. +if [ -z ${OS_USERNAME_INPUT+x} ]; then + read -sp "Please enter your OpenStack Username for project $OS_PROJECT_NAME: " OS_USERNAME_INPUT +fi +export OS_USERNAME=OS_USERNAME_INPUT # With Keystone you pass the keystone password. if [ -z ${OS_PASSWORD_INPUT+x} ]; then |