diff options
author | gwu <gary.i.wu@huawei.com> | 2018-07-17 22:11:39 -0700 |
---|---|---|
committer | Gary Wu <gary.i.wu@huawei.com> | 2018-07-17 23:15:37 -0700 |
commit | 10db462fe75f1b588d5c8861dd2c8017f89c978a (patch) | |
tree | 482f494fe283dc85ced2bbc16dd1dc89cbe55dc2 /deployment/heat/onap-oom/env/gwu | |
parent | fb4b8fb98af42e61dff04a335809c268da1eb006 (diff) |
Update lab RC files
Change-Id: Ie50b3c75047f1dac0af471e46c04ecd02c0dee82
Issue-ID: INT-532
Signed-off-by: gwu <gary.i.wu@huawei.com>
Diffstat (limited to 'deployment/heat/onap-oom/env/gwu')
-rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-heat-openrc | 9 | ||||
-rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-heat.env (renamed from deployment/heat/onap-oom/env/gwu/onap.env) | 5 | ||||
-rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-oom-openrc | 9 | ||||
-rw-r--r-- | deployment/heat/onap-oom/env/gwu/onap-oom.env | 42 | ||||
l--------- | deployment/heat/onap-oom/env/gwu/onap-openrc | 1 |
5 files changed, 63 insertions, 3 deletions
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.env b/deployment/heat/onap-oom/env/gwu/onap-heat.env index efc263e07..07ac9c1ee 100644 --- a/deployment/heat/onap-oom/env/gwu/onap.env +++ b/deployment/heat/onap-oom/env/gwu/onap-heat.env @@ -3,12 +3,13 @@ parameters: ubuntu_1604_image: xenial apt_proxy: 192.168.1.51:3142 - docker_proxy: 192.168.1.51:5000 + docker_proxy: 192.168.2.20:5000 rancher_vm_flavor: m1.xlarge k8s_vm_flavor: m1.xlarge - public_net_id: 024582bd-ef9b-48b9-9e70-e6732559d9df + public_net_id: bfd766f4-ccb5-4d14-944a-fcf1a94a824c + key_name: onap-key oam_network_cidr: 10.0.0.0/16 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 |