From 10db462fe75f1b588d5c8861dd2c8017f89c978a Mon Sep 17 00:00:00 2001 From: gwu Date: Tue, 17 Jul 2018 22:11:39 -0700 Subject: Update lab RC files Change-Id: Ie50b3c75047f1dac0af471e46c04ecd02c0dee82 Issue-ID: INT-532 Signed-off-by: gwu --- deployment/heat/onap-oom/env/gwu/onap-heat-openrc | 9 +++++ deployment/heat/onap-oom/env/gwu/onap-heat.env | 42 ++++++++++++++++++++++ deployment/heat/onap-oom/env/gwu/onap-oom-openrc | 9 +++++ deployment/heat/onap-oom/env/gwu/onap-oom.env | 42 ++++++++++++++++++++++ deployment/heat/onap-oom/env/gwu/onap-openrc | 1 - deployment/heat/onap-oom/env/gwu/onap.env | 41 --------------------- .../onap-oom/env/huawei/onap-beijing-oom-openrc | 1 - .../heat/onap-oom/env/huawei/onap-beijing-oom.env | 41 --------------------- .../heat/onap-oom/env/huawei/onap-heat-openrc | 9 +++++ deployment/heat/onap-oom/env/huawei/onap-heat.env | 42 ++++++++++++++++++++++ .../heat/onap-oom/env/huawei/onap-oom-openrc | 9 +++++ deployment/heat/onap-oom/env/huawei/onap-oom.env | 42 ++++++++++++++++++++++ 12 files changed, 204 insertions(+), 84 deletions(-) create mode 100644 deployment/heat/onap-oom/env/gwu/onap-heat-openrc create mode 100644 deployment/heat/onap-oom/env/gwu/onap-heat.env create mode 100644 deployment/heat/onap-oom/env/gwu/onap-oom-openrc create mode 100644 deployment/heat/onap-oom/env/gwu/onap-oom.env delete mode 120000 deployment/heat/onap-oom/env/gwu/onap-openrc delete mode 100644 deployment/heat/onap-oom/env/gwu/onap.env delete mode 120000 deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc delete mode 100644 deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env create mode 100644 deployment/heat/onap-oom/env/huawei/onap-heat-openrc create mode 100644 deployment/heat/onap-oom/env/huawei/onap-heat.env create mode 100644 deployment/heat/onap-oom/env/huawei/onap-oom-openrc create mode 100644 deployment/heat/onap-oom/env/huawei/onap-oom.env (limited to 'deployment/heat/onap-oom/env') diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat-openrc b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc new file mode 100644 index 000000000..c28e37823 --- /dev/null +++ b/deployment/heat/onap-oom/env/gwu/onap-heat-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_DOMAIN_NAME=Default +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_ID=7504c113f3b241fab1ee9d3d9323f6c1 +export OS_PROJECT_NAME=onap-heat +export OS_USERNAME=demo +#export OS_PASSWORD=demo +export OS_AUTH_URL=http://controller:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_IMAGE_API_VERSION=2 diff --git a/deployment/heat/onap-oom/env/gwu/onap-heat.env b/deployment/heat/onap-oom/env/gwu/onap-heat.env new file mode 100644 index 000000000..07ac9c1ee --- /dev/null +++ b/deployment/heat/onap-oom/env/gwu/onap-heat.env @@ -0,0 +1,42 @@ +parameters: + + ubuntu_1604_image: xenial + + apt_proxy: 192.168.1.51:3142 + docker_proxy: 192.168.2.20:5000 + + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge + + public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c + key_name: onap-key + + oam_network_cidr: 10.0.0.0/16 + + integration_override_yaml: > + global: + repository: 192.168.1.51:5000 + pullPolicy: IfNotPresent + robot: + openStackKeyStoneUrl: "http://192.168.1.11:5000" + openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df" + openStackPassword: "${OS_PASSWORD}" + openStackTenantId: "${OS_PROJECT_ID}" + openStackUserName: "${OS_USERNAME}" + ubuntu14Image: "trusty" + ubuntu16Image: "xenial" + 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://192.168.1.11:5000" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom-openrc b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc new file mode 100644 index 000000000..d11ead498 --- /dev/null +++ b/deployment/heat/onap-oom/env/gwu/onap-oom-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_DOMAIN_NAME=Default +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_ID=6d39557690ff4bc18372d0ca6c0e3d82 +export OS_PROJECT_NAME=onap-oom +export OS_USERNAME=demo +#export OS_PASSWORD=demo +export OS_AUTH_URL=http://controller:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_IMAGE_API_VERSION=2 diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env new file mode 100644 index 000000000..07ac9c1ee --- /dev/null +++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env @@ -0,0 +1,42 @@ +parameters: + + ubuntu_1604_image: xenial + + apt_proxy: 192.168.1.51:3142 + docker_proxy: 192.168.2.20:5000 + + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge + + public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c + key_name: onap-key + + oam_network_cidr: 10.0.0.0/16 + + integration_override_yaml: > + global: + repository: 192.168.1.51:5000 + pullPolicy: IfNotPresent + robot: + openStackKeyStoneUrl: "http://192.168.1.11:5000" + openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df" + openStackPassword: "${OS_PASSWORD}" + openStackTenantId: "${OS_PROJECT_ID}" + openStackUserName: "${OS_USERNAME}" + ubuntu14Image: "trusty" + ubuntu16Image: "xenial" + 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://192.168.1.11:5000" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/gwu/onap-openrc b/deployment/heat/onap-oom/env/gwu/onap-openrc deleted file mode 120000 index c08bcbda6..000000000 --- a/deployment/heat/onap-oom/env/gwu/onap-openrc +++ /dev/null @@ -1 +0,0 @@ -../../../../../test/ete/labs/gwu/onap-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/gwu/onap.env b/deployment/heat/onap-oom/env/gwu/onap.env deleted file mode 100644 index efc263e07..000000000 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ /dev/null @@ -1,41 +0,0 @@ -parameters: - - ubuntu_1604_image: xenial - - apt_proxy: 192.168.1.51:3142 - docker_proxy: 192.168.1.51:5000 - - rancher_vm_flavor: m1.xlarge - k8s_vm_flavor: m1.xlarge - - public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df - - oam_network_cidr: 10.0.0.0/16 - - integration_override_yaml: > - global: - repository: 192.168.1.51:5000 - pullPolicy: IfNotPresent - robot: - openStackKeyStoneUrl: "http://192.168.1.11:5000" - openStackPublicNetId: "024582bd-ef9b-48b9-9e70-e6732559d9df" - openStackPassword: "${OS_PASSWORD}" - openStackTenantId: "${OS_PROJECT_ID}" - openStackUserName: "${OS_USERNAME}" - ubuntu14Image: "trusty" - ubuntu16Image: "xenial" - 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://192.168.1.11:5000" - openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" - appc: - replicaCount: 3 - sdnc: - replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc deleted file mode 120000 index 38d9b3ffd..000000000 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom-openrc +++ /dev/null @@ -1 +0,0 @@ -../../../../../test/ete/labs/huawei/onap-beijing-oom-openrc \ No newline at end of file diff --git a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env b/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env deleted file mode 100644 index f50d85a31..000000000 --- a/deployment/heat/onap-oom/env/huawei/onap-beijing-oom.env +++ /dev/null @@ -1,41 +0,0 @@ -parameters: - - ubuntu_1604_image: xenial - - apt_proxy: 10.145.122.118:3142 - docker_proxy: 10.145.122.118:5000 - - rancher_vm_flavor: m1.xlarge - k8s_vm_flavor: m1.xlarge - - public_net_id: 3a6247f1-fac6-4167-a49f-33cc8415ccf4 - - oam_network_cidr: 10.0.0.0/16 - - integration_override_yaml: > - global: - repository: 10.145.122.118:5000 - pullPolicy: IfNotPresent - robot: - openStackKeyStoneUrl: "http://10.145.122.117:5000" - openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4" - openStackPassword: "${OS_PASSWORD}" - openStackTenantId: "${OS_PROJECT_ID}" - openStackUserName: "${OS_USERNAME}" - ubuntu14Image: "trusty" - ubuntu16Image: "xenial" - 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.145.122.117:5000" - openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" - appc: - replicaCount: 3 - sdnc: - replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/huawei/onap-heat-openrc b/deployment/heat/onap-oom/env/huawei/onap-heat-openrc new file mode 100644 index 000000000..301aeeed5 --- /dev/null +++ b/deployment/heat/onap-oom/env/huawei/onap-heat-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_DOMAIN_NAME=Default +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_ID=66a48e4b0a934463bef0bd694f93147a +export OS_PROJECT_NAME=onap-heat +export OS_USERNAME=demo +#export OS_PASSWORD=demo +export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_IMAGE_API_VERSION=2 diff --git a/deployment/heat/onap-oom/env/huawei/onap-heat.env b/deployment/heat/onap-oom/env/huawei/onap-heat.env new file mode 100644 index 000000000..d4d82e712 --- /dev/null +++ b/deployment/heat/onap-oom/env/huawei/onap-heat.env @@ -0,0 +1,42 @@ +parameters: + + ubuntu_1604_image: xenial + + apt_proxy: 10.145.122.117:8000 + docker_proxy: 10.145.123.23:5000 + + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge + + public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a + key_name: onap-key + + oam_network_cidr: 10.0.0.0/16 + + integration_override_yaml: > + global: + repository: 10.145.122.118:5000 + pullPolicy: IfNotPresent + robot: + openStackKeyStoneUrl: "http://10.145.122.118:5000" + openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4" + openStackPassword: "${OS_PASSWORD}" + openStackTenantId: "${OS_PROJECT_ID}" + openStackUserName: "${OS_USERNAME}" + ubuntu14Image: "trusty" + ubuntu16Image: "xenial" + 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.145.122.118:5000" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom-openrc b/deployment/heat/onap-oom/env/huawei/onap-oom-openrc new file mode 100644 index 000000000..cdafe23c3 --- /dev/null +++ b/deployment/heat/onap-oom/env/huawei/onap-oom-openrc @@ -0,0 +1,9 @@ +export OS_PROJECT_DOMAIN_NAME=Default +export OS_USER_DOMAIN_NAME=Default +export OS_PROJECT_ID=13159ba149fa47ea9646902ce5734b89 +export OS_PROJECT_NAME=onap-oom +export OS_USERNAME=demo +#export OS_PASSWORD=demo +export OS_AUTH_URL=http://controller.neo.futurewei.com:5000/v3 +export OS_IDENTITY_API_VERSION=3 +export OS_IMAGE_API_VERSION=2 diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env new file mode 100644 index 000000000..d4d82e712 --- /dev/null +++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env @@ -0,0 +1,42 @@ +parameters: + + ubuntu_1604_image: xenial + + apt_proxy: 10.145.122.117:8000 + docker_proxy: 10.145.123.23:5000 + + rancher_vm_flavor: m1.xlarge + k8s_vm_flavor: m1.xlarge + + public_net_id: 7baa99ac-43a0-4013-9dfb-bbb94fdcd91a + key_name: onap-key + + oam_network_cidr: 10.0.0.0/16 + + integration_override_yaml: > + global: + repository: 10.145.122.118:5000 + pullPolicy: IfNotPresent + robot: + openStackKeyStoneUrl: "http://10.145.122.118:5000" + openStackPublicNetId: "3a6247f1-fac6-4167-a49f-33cc8415ccf4" + openStackPassword: "${OS_PASSWORD}" + openStackTenantId: "${OS_PROJECT_ID}" + openStackUserName: "${OS_USERNAME}" + ubuntu14Image: "trusty" + ubuntu16Image: "xenial" + 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.145.122.118:5000" + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" + appc: + replicaCount: 3 + sdnc: + replicaCount: 3 -- cgit 1.2.3-korg