From 6b60c21f73a03da2f8eead8d12084f10b217616d Mon Sep 17 00:00:00 2001 From: Gary Wu Date: Thu, 19 Jul 2018 07:38:52 -0700 Subject: Rename windriver tenants for staging tests Change-Id: I9df5ed8239be8a615103be30fd2f933793bcf505 Issue-ID: INT-532 Signed-off-by: Gary Wu --- .../Integration-HEAT-Staging-Daily-openrc | 1 + .../windriver/Integration-HEAT-Staging-Daily.env | 45 ++++++++++++++++++++++ .../env/windriver/Integration-Jenkins-openrc | 1 - .../onap-oom/env/windriver/Integration-Jenkins.env | 45 ---------------------- .../windriver/Integration-OOM-Staging-Daily-openrc | 1 + .../windriver/Integration-OOM-Staging-Daily.env | 45 ++++++++++++++++++++++ 6 files changed, 92 insertions(+), 46 deletions(-) create mode 120000 deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc create mode 100644 deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env delete mode 120000 deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc delete mode 100644 deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env create mode 120000 deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc create mode 100644 deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env (limited to 'deployment/heat/onap-oom/env') diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc new file mode 120000 index 000000000..06bcec770 --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily-openrc @@ -0,0 +1 @@ +../../../../../test/ete/labs/windriver/Integration-HEAT-Staging-Daily-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env new file mode 100644 index 000000000..ebbfe689e --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-HEAT-Staging-Daily.env @@ -0,0 +1,45 @@ +parameters: + + ubuntu_1604_image: ubuntu-16-04-cloud-amd64 + + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 + + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge + + public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 + + oam_network_cidr: 10.0.0.0/16 + + integration_override_yaml: > + global: + repository: 10.12.5.2:5000 + pullPolicy: IfNotPresent + robot: + openStackKeyStoneUrl: "http://10.12.25.2:5000" + openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" + openStackPassword: "${OS_PASSWORD}" + openStackTenantId: "${OS_PROJECT_ID}" + openStackUserName: "${OS_USERNAME}" + ubuntu14Image: "ubuntu-14-04-cloud-amd64" + ubuntu16Image: "ubuntu-16-04-cloud-amd64" + openStackPrivateNetId: "__oam_network_id__" + openStackPrivateSubnetId: "__oam_subnet_id__" + openStackPrivateNetCidr: "10.0.0.0/16" + openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + so: + config: + openStackUserName: "${OS_USERNAME}" + openStackKeyStoneUrl: "http://10.12.25.2:5000" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + config: + enableClustering: true + sdnc: + replicaCount: 3 + config: + enableClustering: true diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc deleted file mode 120000 index 7f4cc2547..000000000 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins-openrc +++ /dev/null @@ -1 +0,0 @@ -../../../../../test/ete/labs/windriver/Integration-Jenkins-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env b/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env deleted file mode 100644 index ebbfe689e..000000000 --- a/deployment/heat/onap-oom/env/windriver/Integration-Jenkins.env +++ /dev/null @@ -1,45 +0,0 @@ -parameters: - - ubuntu_1604_image: ubuntu-16-04-cloud-amd64 - - apt_proxy: 10.12.5.2:3142 - docker_proxy: 10.12.5.2:5000 - - rancher_vm_flavor: m1.xlarge - k8s_vm_flavor: m1.xlarge - - public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 - - oam_network_cidr: 10.0.0.0/16 - - integration_override_yaml: > - global: - repository: 10.12.5.2:5000 - pullPolicy: IfNotPresent - robot: - openStackKeyStoneUrl: "http://10.12.25.2:5000" - openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" - openStackPassword: "${OS_PASSWORD}" - openStackTenantId: "${OS_PROJECT_ID}" - openStackUserName: "${OS_USERNAME}" - ubuntu14Image: "ubuntu-14-04-cloud-amd64" - ubuntu16Image: "ubuntu-16-04-cloud-amd64" - openStackPrivateNetId: "__oam_network_id__" - openStackPrivateSubnetId: "__oam_subnet_id__" - openStackPrivateNetCidr: "10.0.0.0/16" - openStackOamNetworkCidrPrefix: "10.0" - dcaeCollectorIp: "__k8s_1_vm_ip__" - vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - so: - config: - openStackUserName: "${OS_USERNAME}" - openStackKeyStoneUrl: "http://10.12.25.2:5000" - openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" - appc: - replicaCount: 3 - config: - enableClustering: true - sdnc: - replicaCount: 3 - config: - enableClustering: true diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc new file mode 120000 index 000000000..b5dd3402b --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily-openrc @@ -0,0 +1 @@ +../../../../../test/ete/labs/windriver/Integration-OOM-Staging-Daily-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env new file mode 100644 index 000000000..ebbfe689e --- /dev/null +++ b/deployment/heat/onap-oom/env/windriver/Integration-OOM-Staging-Daily.env @@ -0,0 +1,45 @@ +parameters: + + ubuntu_1604_image: ubuntu-16-04-cloud-amd64 + + apt_proxy: 10.12.5.2:3142 + docker_proxy: 10.12.5.2:5000 + + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge + + public_net_id: 971040b2-7059-49dc-b220-4fab50cb2ad4 + + oam_network_cidr: 10.0.0.0/16 + + integration_override_yaml: > + global: + repository: 10.12.5.2:5000 + pullPolicy: IfNotPresent + robot: + openStackKeyStoneUrl: "http://10.12.25.2:5000" + openStackPublicNetId: "971040b2-7059-49dc-b220-4fab50cb2ad4" + openStackPassword: "${OS_PASSWORD}" + openStackTenantId: "${OS_PROJECT_ID}" + openStackUserName: "${OS_USERNAME}" + ubuntu14Image: "ubuntu-14-04-cloud-amd64" + ubuntu16Image: "ubuntu-16-04-cloud-amd64" + openStackPrivateNetId: "__oam_network_id__" + openStackPrivateSubnetId: "__oam_subnet_id__" + openStackPrivateNetCidr: "10.0.0.0/16" + openStackOamNetworkCidrPrefix: "10.0" + dcaeCollectorIp: "__k8s_1_vm_ip__" + vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + so: + config: + openStackUserName: "${OS_USERNAME}" + openStackKeyStoneUrl: "http://10.12.25.2:5000" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + config: + enableClustering: true + sdnc: + replicaCount: 3 + config: + enableClustering: true -- cgit 1.2.3-korg