diff options
| -rw-r--r-- | test/ete/labs/windriver/Integration-Jenkins-openrc | 10 | ||||
| -rw-r--r-- | test/ete/labs/windriver/Integration-Jenkins-openrc.sh | 47 | ||||
| -rw-r--r-- | test/ete/labs/windriver/Integration-SB-04-openrc.sh | 49 | ||||
| -rw-r--r-- | test/ete/labs/windriver/Integration-Stable-openrc | 10 |
4 files changed, 20 insertions, 96 deletions
diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc b/test/ete/labs/windriver/Integration-Jenkins-openrc new file mode 100644 index 000000000..8c6a153cf --- /dev/null +++ b/test/ete/labs/windriver/Integration-Jenkins-openrc @@ -0,0 +1,10 @@ +export OS_PROJECT_ID="09d8566ea45e43aa974cf447ed591d77" + +export OS_PROJECT_NAME="Integration-Jenkins" +export OS_USER_DOMAIN_NAME="Default" +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME="RegionOne" +export OS_INTERFACE=public diff --git a/test/ete/labs/windriver/Integration-Jenkins-openrc.sh b/test/ete/labs/windriver/Integration-Jenkins-openrc.sh deleted file mode 100644 index ca2e2c2cf..000000000 --- a/test/ete/labs/windriver/Integration-Jenkins-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="09d8566ea45e43aa974cf447ed591d77" -export OS_PROJECT_NAME="Integration-Jenkins" -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-SB-04-openrc.sh b/test/ete/labs/windriver/Integration-SB-04-openrc.sh deleted file mode 100644 index e7cee93b9..000000000 --- a/test/ete/labs/windriver/Integration-SB-04-openrc.sh +++ /dev/null @@ -1,49 +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="d570c718cbc545029f40e50b75eb13df" -export OS_PROJECT_NAME="Integration-SB-04" -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**. -# 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 b/test/ete/labs/windriver/Integration-Stable-openrc new file mode 100644 index 000000000..fae5c399a --- /dev/null +++ b/test/ete/labs/windriver/Integration-Stable-openrc @@ -0,0 +1,10 @@ +export OS_PROJECT_ID=3583253e932845a09cd4c8ca2f31d095" + +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_NAME=Integration-Stable +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.2:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_REGION_NAME="RegionOne" +export OS_INTERFACE=public |