Change OAM CIDR to /16

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

diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env
index 6ac4e00..b94bcca 100644 (file)
--- a/heat/ONAP/onap_openstack.env
+++ b/heat/ONAP/onap_openstack.env
@@ -70,7 +70,7 @@ parameters:
 
   ### Private IP addresses ###
 
-  oam_network_cidr: 10.0.0.0/8
+  oam_network_cidr: 10.0.0.0/16
   aai1_ip_addr: 10.0.1.1
   aai2_ip_addr: 10.0.1.2
   appc_ip_addr: 10.0.2.1

diff --git a/heat/ONAP/onap_openstack_float.env b/heat/ONAP/onap_openstack_float.env
index 6446e3d..4f3a42d 100644 (file)
--- a/heat/ONAP/onap_openstack_float.env
+++ b/heat/ONAP/onap_openstack_float.env
@@ -96,7 +96,7 @@ parameters:
 
   ### Private IP addresses ###
 
-  oam_network_cidr: 10.0.0.0/8
+  oam_network_cidr: 10.0.0.0/16
   aai1_ip_addr: 10.0.1.1
   aai2_ip_addr: 10.0.1.2
   appc_ip_addr: 10.0.2.1

diff --git a/heat/ONAP/onap_openstack_nofloat.env b/heat/ONAP/onap_openstack_nofloat.env
index 4409dca..dad932b 100644 (file)
--- a/heat/ONAP/onap_openstack_nofloat.env
+++ b/heat/ONAP/onap_openstack_nofloat.env
@@ -67,7 +67,7 @@ parameters:
 
   external_dns: PUT THE ADDRESS OF THE EXTERNAL DNS HERE
 
-  oam_network_cidr: 10.0.0.0/8
+  oam_network_cidr: 10.0.0.0/16
   aai1_ip_addr: 10.0.1.1
   aai2_ip_addr: 10.0.1.2
   appc_ip_addr: 10.0.2.1

diff --git a/heat/ONAP/onap_rackspace.yaml b/heat/ONAP/onap_rackspace.yaml
index 6f03535..36089a8 100644 (file)
--- a/heat/ONAP/onap_rackspace.yaml
+++ b/heat/ONAP/onap_rackspace.yaml
@@ -199,7 +199,7 @@ resources:
           params:
             rand: { get_resource: random-str }
       network_id: { get_resource: oam_ecomp }
-      cidr: 10.0.0.0/8
+      cidr: 10.0.0.0/16
 
 
   # DNS Server instantiation

diff --git a/heat/vFW/base_vfw_openstack.env b/heat/vFW/base_vfw_openstack.env
index e9ceb48..2e49aca 100644 (file)
--- a/heat/vFW/base_vfw_openstack.env
+++ b/heat/vFW/base_vfw_openstack.env
@@ -8,7 +8,7 @@ parameters:
   onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE\r
   unprotected_private_net_cidr: 192.168.10.0/24\r
   protected_private_net_cidr: 192.168.20.0/24\r
-  onap_private_net_cidr: 10.0.0.0/8\r
+  onap_private_net_cidr: 10.0.0.0/16\r
   vfw_private_ip_0: 192.168.10.100\r
   vfw_private_ip_1: 192.168.20.100\r
   vfw_private_ip_2: 10.1.0.1\r

diff --git a/heat/vFW/base_vfw_rackspace.env b/heat/vFW/base_vfw_rackspace.env
index 34c551f..4e463f7 100644 (file)
--- a/heat/vFW/base_vfw_rackspace.env
+++ b/heat/vFW/base_vfw_rackspace.env
@@ -8,7 +8,7 @@ parameters:
   onap_private_subnet_id: PUT THE ONAP PRIVATE NETWORK NAME HERE
   unprotected_private_net_cidr: 192.168.10.0/24
   protected_private_net_cidr: 192.168.20.0/24
-  onap_private_net_cidr: 10.0.0.0/8
+  onap_private_net_cidr: 10.0.0.0/16
   vfw_private_ip_0: 192.168.10.100
   vfw_private_ip_1: 192.168.20.100
   vfw_private_ip_2: 10.1.0.1

diff --git a/heat/vLB/base_vlb_rackspace.env b/heat/vLB/base_vlb_rackspace.env
index f09898e..20ef73e 100644 (file)
--- a/heat/vLB/base_vlb_rackspace.env
+++ b/heat/vLB/base_vlb_rackspace.env
@@ -6,7 +6,7 @@ parameters:
   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: 10.0.0.0/8
+  onap_private_net_cidr: 10.0.0.0/16
   vlb_private_ip_0: 192.168.10.111
   vlb_private_ip_1: 10.1.0.4
   vdns_private_ip_0: 192.168.10.211

diff --git a/vagrant/setup_proxy.sh b/vagrant/setup_proxy.sh
index 2161f29..da7452e 100755 (executable)
--- a/vagrant/setup_proxy.sh
+++ b/vagrant/setup_proxy.sh
@@ -31,9 +31,9 @@ sudo iptables -t mangle -F
 sudo iptables -t nat -F
 
 sudo iptables -t nat -N REDSOCKS || true
-sudo iptables -t nat -A REDSOCKS -d 0.0.0.0/8 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 10.0.0.0/8 -j RETURN
-sudo iptables -t nat -A REDSOCKS -d 127.0.0.0/8 -j RETURN
+sudo iptables -t nat -A REDSOCKS -d 0.0.0.0/16 -j RETURN
+sudo iptables -t nat -A REDSOCKS -d 10.0.0.0/16 -j RETURN
+sudo iptables -t nat -A REDSOCKS -d 127.0.0.0/16 -j RETURN
 sudo iptables -t nat -A REDSOCKS -d 169.254.0.0/16 -j RETURN
 sudo iptables -t nat -A REDSOCKS -d 172.16.0.0/12 -j RETURN
 sudo iptables -t nat -A REDSOCKS -d 192.168.0.0/16 -j RETURN