From: Marco Platania Date: Fri, 4 Aug 2017 18:21:56 +0000 (+0000) Subject: Merge "Initial KEA DHCP Hook" X-Git-Tag: 1.0.0-Amsterdam~233 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=a94e309943d51a2d56e9aa19a582ac9eb40966e6;hp=f08fe6bfad6f9d044512142f104609d5c092a4f1;p=demo.git Merge "Initial KEA DHCP Hook" --- 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/vCPE/infra/base_vcpe_infra_rackspace.env b/heat/vCPE/infra/base_vcpe_infra_rackspace.env index ea709810..54e74d1e 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.env +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.env @@ -1,5 +1,5 @@ parameters: - vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) + vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) vcpe_flavor_name: 4 GB General Purpose v1 public_net_id: 00000000-0000-0000-0000-000000000000 cpe_signal_net_id: zdfw1cpe01_private diff --git a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml index 8e93bdc5..914a202b 100644 --- a/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml +++ b/heat/vCPE/infra/base_vcpe_infra_rackspace.yaml @@ -394,7 +394,7 @@ resources: network: { get_resource: cpe_public_network } fixed_ips: [{"subnet": { get_resource: cpe_public_subnet }, "ip_address": { get_param: vweb_private_ip_0 }}] - vdhcp_private_1_port: + vweb_private_1_port: type: OS::Neutron::Port properties: network: { get_param: onap_private_net_id } diff --git a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env index 015f3feb..619dec49 100644 --- a/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env +++ b/heat/vCPE/vbng/base_vcpe_vbng_rackspace.env @@ -1,5 +1,5 @@ parameters: - vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) + vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) vcpe_flavor_name: 4 GB General Purpose v1 public_net_id: 00000000-0000-0000-0000-000000000000 brgemu_bng_private_net_id: zdfw1bngin01_private diff --git a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env index ea05e090..475a170c 100644 --- a/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env +++ b/heat/vCPE/vbrgemu/base_vcpe_vbrgemu_rackspace.env @@ -1,5 +1,5 @@ parameters: - vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) + vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) vcpe_flavor_name: 4 GB General Purpose v1 public_net_id: 00000000-0000-0000-0000-000000000000 brgemu_bng_private_net_id: zdfw1brgemubng01_private diff --git a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env index 7ad5b55b..e3009f1a 100644 --- a/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env +++ b/heat/vCPE/vgmux/base_vcpe_vgmux_rackspace.env @@ -1,5 +1,5 @@ parameters: - vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) + vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) vcpe_flavor_name: 4 GB General Purpose v1 public_net_id: 00000000-0000-0000-0000-000000000000 bng_mux_private_net_id: zdfw1bngmux01_private diff --git a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env index 080a999c..faddf083 100644 --- a/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env +++ b/heat/vCPE/vgw/base_vcpe_vgw_rackspace.env @@ -1,5 +1,5 @@ parameters: - vcpe_image_name: Ubuntu 14.04 LTS (Trusty Tahr) (PVHVM) + vcpe_image_name: Ubuntu 16.04 LTS (Xenial Xerus) (PVHVM) vcpe_flavor_name: 4 GB General Purpose v1 public_net_id: 00000000-0000-0000-0000-000000000000 mux_gw_private_net_id: zdfw1muxgw01_private 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