X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deployment%2Fheat%2Fonap-oom%2Fenv%2Fgwu%2Fonap-oom.env;h=e0c57f738885dc5ea2fdceabb2005ec1d9f09fb8;hb=565a8d8d88e8dc4bed2958fce2032835d4e5ea12;hp=0090e604dde0a487db960659915045b4240d3de6;hpb=ac63dd52f4bc8fbdbe231120d06b8bef3c165973;p=integration.git diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env index 0090e604d..e0c57f738 100644 --- a/deployment/heat/onap-oom/env/gwu/onap-oom.env +++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env @@ -5,7 +5,7 @@ parameters: apt_proxy: 192.168.1.51:3142 docker_proxy: 192.168.2.18:5000 - rancher_vm_flavor: m1.xlarge + rancher_vm_flavor: c1.xlarge k8s_vm_flavor: c1.xlarge public_net_id: c3352d4c-8452-4172-b09c-15f017673708 @@ -15,28 +15,36 @@ parameters: integration_override_yaml: > global: - repository: 192.168.2.20:5000 + repository: __docker_proxy__ pullPolicy: IfNotPresent robot: openStackKeyStoneUrl: "http://192.168.1.11:5000" - openStackPublicNetId: "c3352d4c-8452-4172-b09c-15f017673708" - openStackPassword: "${OS_PASSWORD}" + openStackPublicNetId: "__public_net_id__" 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" + openStackPrivateNetCidr: "__oam_network_cidr__" openStackOamNetworkCidrPrefix: "10.0" dcaeCollectorIp: "__k8s_1_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" + demoArtifactsVersion: "1.2.2" + scriptVersion: "1.2.1" + rancherIpAddress: "__rancher_ip_addr__" + config: + openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" so: config: openStackUserName: "${OS_USERNAME}" openStackKeyStoneUrl: "http://192.168.1.11:5000" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: - replicaCount: 3 + replicaCount: 1 + config: + enableClustering: false sdnc: replicaCount: 3 + config: + enableClustering: true