Merge "switch drools pdp image to new one"

[integration.git] / deployment / heat / onap-oom / parts / onap-oom-1.yaml

diff --git a/deployment/heat/onap-oom/parts/onap-oom-1.yaml b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
index ab79b1e..a8ed24a 100644 (file)
--- a/deployment/heat/onap-oom/parts/onap-oom-1.yaml
+++ b/deployment/heat/onap-oom/parts/onap-oom-1.yaml
@@ -28,6 +28,14 @@ parameters:
     type: string
     description: VM flavor for k8s hosts
 
+  etcd_vm_flavor:
+    type: string
+    description: VM flavor for etcd hosts
+
+  orch_vm_flavor:
+    type: string
+    description: VM flavor for orch hosts
+
   integration_override_yaml:
     type: string
     description: Content for integration_override.yaml
@@ -38,7 +46,7 @@ parameters:
 
   integration_gerrit_refspec:
     type: string
-    default: "refs/heads/master"
+    default: ""
 
   oom_gerrit_branch:
     type: string
@@ -46,7 +54,7 @@ parameters:
 
   oom_gerrit_refspec:
     type: string
-    default: "refs/heads/master"
+    default: ""
 
   docker_manifest:
     type: string
@@ -58,24 +66,42 @@ parameters:
 
   docker_version:
     type: string
-    default: "17.03"
+    default: "17.03.2"
 
   rancher_version:
     type: string
-    default: "1.6.18"
+    default: "1.6.26"
 
   rancher_agent_version:
     type: string
-    default: "1.2.10"
+    default: "1.2.11"
 
   kubectl_version:
     type: string
-    default: "1.8.10"
+    default: "1.11.8"
 
   helm_version:
     type: string
     default: "2.9.1"
 
+  helm_deploy_delay:
+    type: string
+    default: "2m"
+
+  use_ramdisk:
+    type: string
+    description: Set to "true" if you want to use a RAM disk for /dockerdata-nfs/.
+    default: "false"
+
+  mtu:
+    type: number
+    default: 1500
+
+  portal_hostname:
+    type: string
+    description: The FQDN of the k8s host that will be used for the Portal UI component URLs; this needs to be resolveable at the client
+    default: "portal.api.simpledemo.onap.org"
+
 resources:
   random-str:
     type: OS::Heat::RandomString
@@ -108,6 +134,10 @@ resources:
         - protocol: tcp
           port_range_min: 1
           port_range_max: 65535
+        # Protocols used for vLB/vDNS use case
+        - protocol: 47
+        - protocol: 53
+        - protocol: 132
 
 
   # ONAP management private network