X-Git-Url: https://gerrit.onap.org/r/gitweb?a=blobdiff_plain;f=deployment%2Fheat%2Fonap-oom%2Fenv%2Ftlab%2Fonap-oom.env;h=04fa44d76e087ca0a994bb710a920a133e6c2ed5;hb=31166e8ec36a152054b6bd561d637bc79aaa0ebf;hp=9680e757522b45d72e79ca5a1418bc524b937979;hpb=fdd87093348ff275b5e526a30b787dcdebd7a92a;p=integration.git diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env index 9680e7575..04fa44d76 100644 --- a/deployment/heat/onap-oom/env/tlab/onap-oom.env +++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env @@ -5,8 +5,8 @@ parameters: apt_proxy: 192.168.31.204:8000 docker_proxy: 192.168.31.204:5000 - rancher_vm_flavor: m5.xlarge - k8s_vm_flavor: m4.xlarge + rancher_vm_flavor: m1.large + k8s_vm_flavor: m1.xlarge etcd_vm_flavor: m1.medium orch_vm_flavor: m1.medium @@ -14,11 +14,16 @@ parameters: oam_network_cidr: 10.0.0.0/16 + helm_deploy_delay: 4m + integration_override_yaml: > global: repository: __docker_proxy__ pullPolicy: IfNotPresent robot: + flavor: large + appcUsername: "appc@appc.onap.org" + appcPassword: "demo123456!" openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000" openStackPublicNetId: "__oam_network_id__" # NOTE: for TLAB, openStackPublicNetId needs to be oam_network_id instead of public_net_id openStackTenantId: "${OS_PROJECT_ID}" @@ -29,10 +34,10 @@ parameters: openStackPrivateSubnetId: "__oam_subnet_id__" openStackPrivateNetCidr: "__oam_network_cidr__" openStackOamNetworkCidrPrefix: "10.0" - dcaeCollectorIp: "__k8s_1_vm_ip__" + dcaeCollectorIp: "__k8s_01_vm_ip__" vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh" - demoArtifactsVersion: "1.2.2" - scriptVersion: "1.2.1" + demoArtifactsVersion: "1.3.0-SNAPSHOT" + scriptVersion: "1.3.0-SNAPSHOT" rancherIpAddress: "__rancher_ip_addr__" config: openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" @@ -43,10 +48,17 @@ parameters: openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0" openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}" appc: - replicaCount: 1 + replicaCount: 3 config: - enableClustering: false + enableClustering: true + openStackType: "OpenStackProvider" + openStackName: "OpenStack" + openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0" + openStackServiceTenantName: "${OS_PROJECT_NAME}" + openStackDomain: "${OS_USER_DOMAIN_NAME}" + openStackUserName: "${OS_USERNAME}" + openStackEncryptedPassword: "${OS_PASSWORD}" sdnc: - replicaCount: 1 + replicaCount: 3 config: - enableClustering: false + enableClustering: true