Workaround for AAI crashloop issues

[integration.git] / deployment / heat / onap-oom / env / tlab / onap-oom.env

diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index 554ad2a..42726e5 100644 (file)
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -6,7 +6,7 @@ parameters:
   docker_proxy: 192.168.31.204:5000
 
   rancher_vm_flavor: m1.large
-  k8s_vm_flavor: m1.xlarge
+  k8s_vm_flavor: m4.xlarge
   etcd_vm_flavor: m1.medium
   orch_vm_flavor: m1.medium
 
@@ -14,6 +14,8 @@ parameters:
 
   oam_network_cidr: 10.0.0.0/16
 
+  integration_gerrit_branch: master
+
   helm_deploy_delay: 4m
 
   integration_override_yaml: >
@@ -22,8 +24,8 @@ parameters:
       pullPolicy: IfNotPresent
     robot:
       flavor: large
-      appcUsername: "admin"
-      appcPassword: "Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U"
+      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}"
@@ -36,8 +38,9 @@ parameters:
       openStackOamNetworkCidrPrefix: "10.0"
       dcaeCollectorIp: "__k8s_01_vm_ip__"
       vnfPubKey: "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQDKXDgoo3+WOqcUG8/5uUbk81+yczgwC4Y8ywTmuQqbNxlY1oQ0YxdMUqUnhitSXs5S/yRuAVOYHwGg2mCs20oAINrP+mxBI544AMIb9itPjCtgqtE2EWo6MmnFGbHB4Sx3XioE7F4VPsh7japsIwzOjbrQe+Mua1TGQ5d4nfEOQaaglXLLPFfuc7WbhbJbK6Q7rHqZfRcOwAMXgDoBqlyqKeiKwnumddo2RyNT8ljYmvB6buz7KnMinzo7qB0uktVT05FH9Rg0CTWH5norlG5qXgP2aukL0gk1ph8iAt7uYLf1ktp+LJI2gaF6L0/qli9EmVCSLr1uJ38Q8CBflhkh"
-      demoArtifactsVersion: "1.3.0-SNAPSHOT"
-      scriptVersion: "1.3.0-SNAPSHOT"
+      demoArtifactsVersion: "1.3.0"
+      demoArtifactsRepoUrl: "https://nexus.onap.org/content/repositories/releases"
+      scriptVersion: "1.3.0"
       rancherIpAddress: "__rancher_ip_addr__"
       config:
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
@@ -51,7 +54,6 @@ parameters:
       replicaCount: 3
       config:
         enableClustering: true
-        enableAAF: false
         openStackType: "OpenStackProvider"
         openStackName: "OpenStack"
         openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000/v2.0"
@@ -59,11 +61,19 @@ parameters:
         openStackDomain: "${OS_USER_DOMAIN_NAME}"
         openStackUserName: "${OS_USERNAME}"
         openStackEncryptedPassword: "${OS_PASSWORD}"
-        odlUser: admin
-        odlPassword: Kp8bJ4SXszM0WXlhak3eHlcse2gAw84vaoGGmJvUy2U
     sdnc:
       replicaCount: 3
       config:
         enableClustering: true
-    vvp:
-      enabled: true
+    aai:
+      liveness:
+        initialDelaySeconds: 120
+      aai-data-router:
+        liveness:
+          initialDelaySeconds: 120
+      aai-sparky-be:
+        liveness:
+          initialDelaySeconds: 120
+      aai-spike:
+        liveness:
+          initialDelaySeconds: 120