diff options
| author |   Hector Anapan-Lavalle <ha076r@att.com> | 2017-08-04 14:35:26 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2017-08-04 14:35:26 +0000 |
| commit | 98e9a903f874816de88c99beef5871910e1a83f0 (patch) | |
| tree | 0388b977a82f6d32768eff70d3ec4b3ef3edc9c9 | |
| parent | 8b91579e896891863aca6bb0ab4e38adcbce2b3f (diff) | |
| parent | 97565f21515574944cd08e43437eff1c69754cab (diff) | |
Merge "Change OAM CIDR to /16"
| -rw-r--r-- | heat/ONAP/onap_openstack.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_float.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_openstack_nofloat.env | 2 | ||||
| -rw-r--r-- | heat/ONAP/onap_rackspace.yaml | 2 | ||||
| -rw-r--r-- | heat/vFW/base_vfw_openstack.env | 2 | ||||
| -rw-r--r-- | heat/vFW/base_vfw_rackspace.env | 2 | ||||
| -rw-r--r-- | heat/vLB/base_vlb_rackspace.env | 2 | ||||
| -rwxr-xr-x | vagrant/setup_proxy.sh | 6 |
8 files changed, 10 insertions, 10 deletions
diff --git a/heat/ONAP/onap_openstack.env b/heat/ONAP/onap_openstack.env index 6ac4e006..b94bcca2 100644 --- 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 6446e3d5..4f3a42df 100644 --- 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 4409dca6..dad932be 100644 --- 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 6f035353..36089a80 100644 --- 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 e9ceb48b..2e49acae 100644 --- 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
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/vFW/base_vfw_rackspace.env b/heat/vFW/base_vfw_rackspace.env index 34c551f6..4e463f77 100644 --- 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 f09898ed..20ef73e7 100644 --- 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 2161f295..da7452e6 100755 --- 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 |