Parametrize CIDR and Netmask in the demos

Change-Id: I01f46fc1ee5cd1774e3db2e3381081dc9fc4c967
Signed-off-by: Marco Platania <platania@research.att.com>

4 files changed, 36 insertions, 0 deletions

diff --git a/heat/vFW/base_vfw_openstack.yaml b/heat/vFW/base_vfw_openstack.yaml
index 9a186722..3ecc4dd3 100644
--- a/heat/vFW/base_vfw_openstack.yaml
+++ b/heat/vFW/base_vfw_openstack.yaml
@@ -253,6 +253,9 @@ resources:
             __vfw_private_ip_0__ : { get_param: vfw_private_ip_0 }

             __vfw_private_ip_1__ : { get_param: vfw_private_ip_1 }

             __vfw_private_ip_2__ : { get_param: vfw_private_ip_2 }

+            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }

+            __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }

+            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }

             __cloud_env__ : { get_param: cloud_env }

           template: |

             #!/bin/bash

@@ -268,6 +271,9 @@ resources:
             echo "__vfw_private_ip_0__" > /opt/config/vfw_private_ip_0.txt

             echo "__vfw_private_ip_1__" > /opt/config/vfw_private_ip_1.txt

             echo "__vfw_private_ip_2__" > /opt/config/vfw_private_ip_2.txt

+            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt

+            echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt

+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt

             echo "__cloud_env__" > /opt/config/cloud_env.txt

             

             # Download and run install script

@@ -315,6 +321,8 @@ resources:
             __install_script_version__ : { get_param: install_script_version }

             __vpg_private_ip_0__ : { get_param: vpg_private_ip_0 }

             __vpg_private_ip_1__ : { get_param: vpg_private_ip_1 }

+            __unprotected_private_net_cidr__ : { get_param: unprotected_private_net_cidr }

+            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }

             __cloud_env__ : { get_param: cloud_env }

           template: |

             #!/bin/bash

@@ -330,6 +338,8 @@ resources:
             echo "__install_script_version__" > /opt/config/install_script_version.txt

             echo "__vpg_private_ip_0__" > /opt/config/vpg_private_ip_0.txt

             echo "__vpg_private_ip_1__" > /opt/config/vpg_private_ip_1.txt

+            echo "__unprotected_private_net_cidr__" > /opt/config/unprotected_private_net_cidr.txt

+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt

             echo "__cloud_env__" > /opt/config/cloud_env.txt

             

             # Download and run install script

@@ -375,6 +385,8 @@ resources:
             __install_script_version__ : { get_param: install_script_version }

             __vsn_private_ip_0__ : { get_param: vsn_private_ip_0 }

             __vsn_private_ip_1__ : { get_param: vsn_private_ip_1 }

+            __protected_private_net_cidr__ : { get_param: protected_private_net_cidr }

+            __onap_private_net_cidr__ : { get_param: onap_private_net_cidr }

             __cloud_env__ : { get_param: cloud_env }

           template: |

             #!/bin/bash

@@ -387,6 +399,8 @@ resources:
             echo "__install_script_version__" > /opt/config/install_script_version.txt

             echo "__vsn_private_ip_0__" > /opt/config/vsn_private_ip_0.txt

             echo "__vsn_private_ip_1__" > /opt/config/vsn_private_ip_1.txt

+            echo "__protected_private_net_cidr__" > /opt/config/protected_private_net_cidr.txt

+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt

             echo "__cloud_env__" > /opt/config/cloud_env.txt

             

             # Download and run install script

diff --git a/heat/vLB/base_vlb_openstack.yaml b/heat/vLB/base_vlb_openstack.yaml
index 3f098576..82687cad 100644
--- a/heat/vLB/base_vlb_openstack.yaml
+++ b/heat/vLB/base_vlb_openstack.yaml
@@ -207,6 +207,8 @@ resources:
             __repo_url_artifacts__: { get_param: repo_url_artifacts }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __install_script_version__: { get_param: install_script_version }
+            __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
@@ -221,6 +223,8 @@ resources:
             echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
@@ -266,6 +270,8 @@ resources:
             __repo_url_artifacts__: { get_param: repo_url_artifacts }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __install_script_version__: { get_param: install_script_version }
+            __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
@@ -280,6 +286,8 @@ resources:
             echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script
diff --git a/heat/vLB/dnsscaling_openstack.env b/heat/vLB/dnsscaling_openstack.env
index dc9679ea..3cc328f4 100644
--- a/heat/vLB/dnsscaling_openstack.env
+++ b/heat/vLB/dnsscaling_openstack.env
@@ -5,6 +5,8 @@ parameters:
   vlb_private_net_id: zdfw1lb01_private
   onap_private_net_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
+  vlb_private_net_cidr: 192.168.10.0/24
+  onap_private_net_cidr: PUT THE ONAP NETWORK CIDR HERE
   vlb_private_ip_0: 192.168.10.111
   vlb_private_ip_1: PUT THE PRIVATE ADDRESS OF THE VLB IN THE ONAP NETWORK SPACE HERE
   vdns_private_ip_0: 192.168.10.212
diff --git a/heat/vLB/dnsscaling_openstack.yaml b/heat/vLB/dnsscaling_openstack.yaml
index 4313c7bb..2e07ca85 100644
--- a/heat/vLB/dnsscaling_openstack.yaml
+++ b/heat/vLB/dnsscaling_openstack.yaml
@@ -57,6 +57,14 @@ parameters:
     type: string
     label: ONAP management sub-network name or ID
     description: Private sub-network that connects ONAP component and the VNF
+  vlb_private_net_cidr:
+    type: string
+    label: vLoadBalancer private network CIDR
+    description: The CIDR of the vLoadBalancer private network
+  onap_private_net_cidr:
+    type: string
+    label: ONAP private network CIDR
+    description: The CIDR of the protected private network
   vlb_private_ip_0:
     type: string
     label: vLoadBalancer private IP address towards the private network
@@ -175,6 +183,8 @@ resources:
             __repo_url_artifacts__: { get_param: repo_url_artifacts }
             __demo_artifacts_version__: { get_param: demo_artifacts_version }
             __install_script_version__: { get_param: install_script_version }
+            __vlb_private_net_cidr__: { get_param: vlb_private_net_cidr }
+            __onap_private_net_cidr__: { get_param: onap_private_net_cidr }
             __cloud_env__: { get_param: cloud_env }
           template: |
             #!/bin/bash
@@ -189,6 +199,8 @@ resources:
             echo "__repo_url_artifacts__" > /opt/config/repo_url_artifacts.txt
             echo "__demo_artifacts_version__" > /opt/config/demo_artifacts_version.txt
             echo "__install_script_version__" > /opt/config/install_script_version.txt
+            echo "__vlb_private_net_cidr__" > /opt/config/vlb_private_net_cidr.txt
+            echo "__onap_private_net_cidr__" > /opt/config/onap_private_net_cidr.txt
             echo "__cloud_env__" > /opt/config/cloud_env.txt
 
             # Download and run install script