Merge "update dmaap-datarouter images"

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

diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index 15819ff..6d471ff 100644 (file)
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -14,6 +14,8 @@ parameters:
 
   oam_network_cidr: 10.0.0.0/16
 
+  integration_gerrit_branch: master
+
   helm_deploy_delay: 2.5m
 
   integration_override_yaml: >
@@ -37,8 +39,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}"
@@ -63,3 +66,15 @@ parameters:
       replicaCount: 3
       config:
         enableClustering: true
+    aai:
+      liveness:
+        initialDelaySeconds: 120
+      aai-data-router:
+        liveness:
+          initialDelaySeconds: 120
+      aai-sparky-be:
+        liveness:
+          initialDelaySeconds: 120
+      aai-spike:
+        liveness:
+          initialDelaySeconds: 120