From b1a16f0c3bb733cd5053416e6a8c11515a1545a5 Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Mon, 12 Mar 2018 13:10:46 -0700 Subject: [PATCH] Add SB-06 and SB-07 Wind River tenants Change-Id: I0bff95d452a5e66e0eb0123d098ffac330f3e41a Issue-ID: INT-278 Signed-off-by: Gary Wu (cherry picked from commit 5adbe338af8ab9334525ebd1ded241302fed8a6b) --- .../env/windriver/Integration-SB-06-DNS-openrc | 1 + .../env/windriver/Integration-SB-06-openrc | 1 + .../onap-oom/env/windriver/Integration-SB-06.env | 33 ++++++++++++++++++++++ .../env/windriver/Integration-SB-07-DNS-openrc | 1 + .../env/windriver/Integration-SB-07-openrc | 1 + .../onap-oom/env/windriver/Integration-SB-07.env | 33 ++++++++++++++++++++++ .../labs/windriver/Integration-SB-06-DNS-openrc | 9 ++++++ test/ete/labs/windriver/Integration-SB-06-openrc | 9 ++++++ .../labs/windriver/Integration-SB-07-DNS-openrc | 9 ++++++ test/ete/labs/windriver/Integration-SB-07-openrc | 9 ++++++ 10 files changed, 106 insertions(+) create mode 120000 deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc create mode 120000 deployment/heat/onap-oom/env/windriver/Integration-SB-06-openrc create mode 100644 deployment/heat/onap-oom/env/windriver/Integration-SB-06.env create mode 120000 deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc create mode 120000 deployment/heat/onap-oom/env/windriver/Integration-SB-07-openrc create mode 100644 deployment/heat/onap-oom/env/windriver/Integration-SB-07.env create mode 100644 test/ete/labs/windriver/Integration-SB-06-DNS-openrc create mode 100644 test/ete/labs/windriver/Integration-SB-06-openrc create mode 100644 test/ete/labs/windriver/Integration-SB-07-DNS-openrc create mode 100644 test/ete/labs/windriver/Integration-SB-07-openrc diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc new file mode 120000 index 000000000..850c25544 --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06-DNS-openrc @@ -0,0 +1 @@ +../../../../../test/ete/labs/windriver/Integration-SB-06-DNS-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-06-openrc new file mode 120000 index 000000000..98ea5829a --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06-openrc @@ -0,0 +1 @@ +../../../../../test/ete/labs/windriver/Integration-SB-06-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env new file mode 100644 index 000000000..4203c79d8 --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-06.env @@ -0,0 +1,33 @@ +parameters: + + keystone_url: http://10.12.25.2:5000 + openstack_tenant_id: 7fad299815104c0a8f90a8df80343f03 + openstack_tenant_name: Integration-SB-06 + openstack_username: demo + openstack_api_key: onapdemo + + ubuntu_1404_image: ubuntu-14-04-cloud-amd64 + ubuntu_1604_image: ubuntu-16-04-cloud-amd64 + centos_7_image: CentOS-7 + + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 + + rancher_vm_flavor: m1.small + k8s_vm_flavor: m1.xxlarge + + public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 + public_net_name: external + + oam_network_cidr: 10.0.0.0/16 + dns_forwarder: 10.12.25.5 + external_dns: 8.8.8.8 + + dnsaas_proxy_enable: "true" + dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0" + dnsaas_keystone_url: http://10.12.25.5:5000 + dnsaas_region: RegionOne + dnsaas_tenant_id: 2d7c6ec2cf9147fa974fa059b3673d7a + dnsaas_tenant_name: Integration-SB-06 + dnsaas_username: demo + dnsaas_password: onapdemo diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc new file mode 120000 index 000000000..7e4a3af20 --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07-DNS-openrc @@ -0,0 +1 @@ +../../../../../test/ete/labs/windriver/Integration-SB-07-DNS-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07-openrc b/deployment/heat/onap-oom/env/windriver/Integration-SB-07-openrc new file mode 120000 index 000000000..87292901c --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07-openrc @@ -0,0 +1 @@ +../../../../../test/ete/labs/windriver/Integration-SB-07-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env new file mode 100644 index 000000000..efefa3888 --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-SB-07.env @@ -0,0 +1,33 @@ +parameters: + + keystone_url: http://10.12.25.2:5000 + openstack_tenant_id: 1e097c6713e74fd7ac8e4295e605ee1e + openstack_tenant_name: Integration-SB-07 + openstack_username: demo + openstack_api_key: onapdemo + + ubuntu_1404_image: ubuntu-14-04-cloud-amd64 + ubuntu_1604_image: ubuntu-16-04-cloud-amd64 + centos_7_image: CentOS-7 + + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 + + rancher_vm_flavor: m1.small + k8s_vm_flavor: m1.xxlarge + + public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 + public_net_name: external + + oam_network_cidr: 10.0.0.0/16 + dns_forwarder: 10.12.25.5 + external_dns: 8.8.8.8 + + dnsaas_proxy_enable: "true" + dnsaas_proxied_keystone_url_path: "api/multicloud-titanium_cloud/v0/pod25_RegionOne/identity/v2.0" + dnsaas_keystone_url: http://10.12.25.5:5000 + dnsaas_region: RegionOne + dnsaas_tenant_id: 885777d5e9074f31ad7801f9e6876b84 + dnsaas_tenant_name: Integration-SB-07 + dnsaas_username: demo + dnsaas_password: onapdemo diff --git a/test/ete/labs/windriver/Integration-SB-06-DNS-openrc b/test/ete/labs/windriver/Integration-SB-06-DNS-openrc new file mode 100644 index 000000000..5f211585a --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-06-DNS-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=2d7c6ec2cf9147fa974fa059b3673d7a +export OS_PROJECT_NAME=Integration-SB-06 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.5: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-SB-06-openrc b/test/ete/labs/windriver/Integration-SB-06-openrc new file mode 100644 index 000000000..c7b650e2c --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-06-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=7fad299815104c0a8f90a8df80343f03 +export OS_PROJECT_NAME=Integration-SB-06 +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-SB-07-DNS-openrc b/test/ete/labs/windriver/Integration-SB-07-DNS-openrc new file mode 100644 index 000000000..170859f87 --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-07-DNS-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=885777d5e9074f31ad7801f9e6876b84 +export OS_PROJECT_NAME=Integration-SB-07 +export OS_USER_DOMAIN_NAME=Default +export OS_USERNAME=demo +export OS_PASSWORD=onapdemo +export OS_AUTH_URL=http://10.12.25.5: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-SB-07-openrc b/test/ete/labs/windriver/Integration-SB-07-openrc new file mode 100644 index 000000000..faf6b4bba --- /dev/null +++ b/test/ete/labs/windriver/Integration-SB-07-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_ID=1e097c6713e74fd7ac8e4295e605ee1e +export OS_PROJECT_NAME=Integration-SB-07 +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 -- 2.16.6