From c954aa1cb92fe90b61f3c8d6cd5b97ad7fe70970 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Fri, 19 Jan 2018 14:23:16 -0800 Subject: Fix file name for Integration-Stable environment Change-Id: Ia6b5f8ae603f3442b5832a7118b95a28643e3a4c Issue-ID: INT-278 Signed-off-by: Gary Wu --- .../labs/windriver/Integration-Stable-openrc.sh | 47 ++++++++++++++++++++++ .../labs/windriver/Integration-Stable.openrc.sh | 47 ---------------------- 2 files changed, 47 insertions(+), 47 deletions(-) create mode 100644 test/ete/labs/windriver/Integration-Stable-openrc.sh delete mode 100644 test/ete/labs/windriver/Integration-Stable.openrc.sh diff --git a/test/ete/labs/windriver/Integration-Stable-openrc.sh b/test/ete/labs/windriver/Integration-Stable-openrc.sh new file mode 100644 index 000000000..d98276df8 --- /dev/null +++ b/test/ete/labs/windriver/Integration-Stable-openrc.sh @@ -0,0 +1,47 @@ +#!/usr/bin/env bash + +# To use an OpenStack cloud you need to authenticate against the Identity +# service named keystone, which returns a **Token** and **Service Catalog**. +# The catalog contains the endpoints for all services the user/tenant has +# access to - such as Compute, Image Service, Identity, Object Storage, Block +# Storage, and Networking (code-named nova, glance, keystone, swift, +# cinder, and neutron). +# +# *NOTE*: Using the 3 *Identity API* does not necessarily mean any other +# OpenStack API is version 3. For example, your cloud provider may implement +# Image API v1.1, Block Storage API v2, and Compute API v2.0. OS_AUTH_URL is +# only for the Identity API served through keystone. +export OS_AUTH_URL=http://10.12.25.2:5000/v3 + +# With the addition of Keystone we have standardized on the term **project** +# as the entity that owns the resources. +export OS_PROJECT_ID="3583253e932845a09cd4c8ca2f31d095" +export OS_PROJECT_NAME="Integration-Stable" +export OS_USER_DOMAIN_NAME="Default" +if [ -z "$OS_USER_DOMAIN_NAME" ]; then unset OS_USER_DOMAIN_NAME; fi + +# unset v2.0 items in case set +unset OS_TENANT_ID +unset OS_TENANT_NAME + +# 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 + read -sp "Please enter your OpenStack Password for project $OS_PROJECT_NAME as user $OS_USERNAME: " OS_PASSWORD_INPUT +fi +export OS_PASSWORD=$OS_PASSWORD_INPUT + +# If your configuration has multiple regions, we set that information here. +# OS_REGION_NAME is optional and only valid in certain environments. +export OS_REGION_NAME="RegionOne" +# Don't leave a blank variable, unset it if it was empty +if [ -z "$OS_REGION_NAME" ]; then unset OS_REGION_NAME; fi + +export OS_INTERFACE=public +export OS_IDENTITY_API_VERSION=3 diff --git a/test/ete/labs/windriver/Integration-Stable.openrc.sh b/test/ete/labs/windriver/Integration-Stable.openrc.sh deleted file mode 100644 index d98276df8..000000000 --- a/test/ete/labs/windriver/Integration-Stable.openrc.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env bash - -# To use an OpenStack cloud you need to authenticate against the Identity -# service named keystone, which returns a **Token** and **Service Catalog**. -# The catalog contains the endpoints for all services the user/tenant has -# access to - such as Compute, Image Service, Identity, Object Storage, Block -# Storage, and Networking (code-named nova, glance, keystone, swift, -# cinder, and neutron). -# -# *NOTE*: Using the 3 *Identity API* does not necessarily mean any other -# OpenStack API is version 3. For example, your cloud provider may implement -# Image API v1.1, Block Storage API v2, and Compute API v2.0. OS_AUTH_URL is -# only for the Identity API served through keystone. -export OS_AUTH_URL=http://10.12.25.2:5000/v3 - -# With the addition of Keystone we have standardized on the term **project** -# as the entity that owns the resources. -export OS_PROJECT_ID="3583253e932845a09cd4c8ca2f31d095" -export OS_PROJECT_NAME="Integration-Stable" -export OS_USER_DOMAIN_NAME="Default" -if [ -z "$OS_USER_DOMAIN_NAME" ]; then unset OS_USER_DOMAIN_NAME; fi - -# unset v2.0 items in case set -unset OS_TENANT_ID -unset OS_TENANT_NAME - -# 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 - read -sp "Please enter your OpenStack Password for project $OS_PROJECT_NAME as user $OS_USERNAME: " OS_PASSWORD_INPUT -fi -export OS_PASSWORD=$OS_PASSWORD_INPUT - -# If your configuration has multiple regions, we set that information here. -# OS_REGION_NAME is optional and only valid in certain environments. -export OS_REGION_NAME="RegionOne" -# Don't leave a blank variable, unset it if it was empty -if [ -z "$OS_REGION_NAME" ]; then unset OS_REGION_NAME; fi - -export OS_INTERFACE=public -export OS_IDENTITY_API_VERSION=3 -- cgit 1.2.3-korg