OOM heat teamplate and env changes for vFWCL

Change-Id: I0791574e48ecb64ae6e046fbd365eb2d3cb971a1
Issue-ID: TEST-110
Signed-off-by: Gary Wu <gary.i.wu@huawei.com>

5 files changed, 21 insertions, 8 deletions

diff --git a/deployment/heat/onap-oom/env/gwu/onap-oom.env b/deployment/heat/onap-oom/env/gwu/onap-oom.env
index b3f1afe56..cd78a94d2 100644
--- a/deployment/heat/onap-oom/env/gwu/onap-oom.env
+++ b/deployment/heat/onap-oom/env/gwu/onap-oom.env
@@ -31,15 +31,18 @@ parameters:
       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__"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
         openStackKeyStoneUrl: "http://192.168.1.11:5000"
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
-      replicaCount: 3
+      replicaCount: 1
       config:
-        enableClustering: true
+        enableClustering: false
     sdnc:
       replicaCount: 3
       config:
diff --git a/deployment/heat/onap-oom/env/huawei/onap-oom.env b/deployment/heat/onap-oom/env/huawei/onap-oom.env
index f346fa59f..96cf46974 100644
--- a/deployment/heat/onap-oom/env/huawei/onap-oom.env
+++ b/deployment/heat/onap-oom/env/huawei/onap-oom.env
@@ -31,15 +31,18 @@ parameters:
       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__"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
         openStackKeyStoneUrl: "http://10.145.122.118:5000"
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
-      replicaCount: 3
+      replicaCount: 1
       config:
-        enableClustering: true
+        enableClustering: false
     sdnc:
       replicaCount: 3
       config:
diff --git a/deployment/heat/onap-oom/env/tlab/onap-oom.env b/deployment/heat/onap-oom/env/tlab/onap-oom.env
index f1b490269..29404190e 100644
--- a/deployment/heat/onap-oom/env/tlab/onap-oom.env
+++ b/deployment/heat/onap-oom/env/tlab/onap-oom.env
@@ -30,15 +30,18 @@ parameters:
       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__"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
         openStackKeyStoneUrl: "https://bdc1tlab01.research.att.com:5000"
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
-      replicaCount: 3
+      replicaCount: 1
       config:
-        enableClustering: true
+        enableClustering: false
     sdnc:
       replicaCount: 3
       config:
diff --git a/deployment/heat/onap-oom/env/windriver/onap-oom.env b/deployment/heat/onap-oom/env/windriver/onap-oom.env
index c1f0ccbcf..15ca052fa 100644
--- a/deployment/heat/onap-oom/env/windriver/onap-oom.env
+++ b/deployment/heat/onap-oom/env/windriver/onap-oom.env
@@ -30,15 +30,18 @@ parameters:
       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__"
     so:
       config:
         openStackUserName: "${OS_USERNAME}"
         openStackKeyStoneUrl: "http://10.12.25.2:5000"
         openStackEncryptedPasswordHere: "${OS_PASSWORD_ENCRYPTED}"
     appc:
-      replicaCount: 3
+      replicaCount: 1
       config:
-        enableClustering: true
+        enableClustering: false
     sdnc:
       replicaCount: 3
       config:
diff --git a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
index ffc4fd5f6..26e8378c6 100644
--- a/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
+++ b/deployment/heat/onap-oom/rancher_vm_entrypoint.sh
@@ -30,6 +30,7 @@ sed -i 's/\_\_public_net_id__/__public_net_id__/g' /opt/config/integration-overr
 sed -i 's|\_\_oam_network_cidr__|__oam_network_cidr__|g' /opt/config/integration-override.yaml
 sed -i 's/\_\_oam_network_id__/__oam_network_id__/g' /opt/config/integration-override.yaml
 sed -i 's/\_\_oam_subnet_id__/__oam_subnet_id__/g' /opt/config/integration-override.yaml
+sed -i 's/\_\_rancher_ip_addr__/__rancher_ip_addr__/g' /opt/config/integration-override.yaml
 sed -i 's/\_\_k8s_1_vm_ip__/__k8s_1_vm_ip__/g' /opt/config/integration-override.yaml
 sed -i 's/\_\_docker_proxy__/__docker_proxy__/g' /opt/config/integration-override.yaml
 cp /opt/config/integration-override.yaml /root