From a16f379e1bb8e9bb52db1cc828a55add8d3c138f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Harald=20Jens=C3=A5s?= Date: Thu, 18 Oct 2018 11:43:41 +0200 Subject: [PATCH] Use 192.168.x.x addressing instead of 192.0.x.x addressing 192.0.x.x is non-private addresses. Since we now in some cases care about the address ranges used in the environment switch to use addresses in the private space 192.168.x.x. Also minor update to doc, router addresses are no longer dynamically allocated. --- .../network-environment.yaml | 4 +- bond-network-templates/ui-settings.pickle | 4 +- doc/source/deploy/baremetal.rst | 2 +- doc/source/deploy/quintupleo.rst | 62 +++++++++---------- .../network-environment.yaml | 4 +- ipv6-network-templates/ui-settings.pickle | 4 +- network-templates/network-environment.yaml | 4 +- network-templates/ui-settings.pickle | 4 +- .../network-environment.yaml | 4 +- .../bond-network-templates/ui-settings.pickle | 4 +- .../network-environment.yaml | 4 +- .../ipv6-network-templates/ui-settings.pickle | 4 +- .../network-environment.yaml | 4 +- .../network-templates/ui-settings.pickle | 4 +- templates/dhcp-relay.yaml | 3 - templates/quintupleo.yaml | 4 +- templates/undercloud-networks-routed.yaml | 12 ++-- templates/undercloud-networks.yaml | 2 +- templates/virtual-baremetal.yaml | 4 +- 19 files changed, 67 insertions(+), 70 deletions(-) diff --git a/bond-network-templates/network-environment.yaml b/bond-network-templates/network-environment.yaml index 3d81639..a4f4a1f 100644 --- a/bond-network-templates/network-environment.yaml +++ b/bond-network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/bond-network-templates/ui-settings.pickle b/bond-network-templates/ui-settings.pickle index 74ec540..22bfce2 100644 --- a/bond-network-templates/ui-settings.pickle +++ b/bond-network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/doc/source/deploy/baremetal.rst b/doc/source/deploy/baremetal.rst index b680fd8..0ce9ac7 100644 --- a/doc/source/deploy/baremetal.rst +++ b/doc/source/deploy/baremetal.rst @@ -37,7 +37,7 @@ method, which creates most of the resources needed automatically. :: neutron net-create provision - neutron subnet-create --name provision --no-gateway --disable-dhcp provision 192.0.2.0/24 + neutron subnet-create --name provision --no-gateway --disable-dhcp provision 192.168.24.0/24 #. Create "public" network. diff --git a/doc/source/deploy/quintupleo.rst b/doc/source/deploy/quintupleo.rst index bfe1e6d..3b8c71c 100644 --- a/doc/source/deploy/quintupleo.rst +++ b/doc/source/deploy/quintupleo.rst @@ -228,10 +228,10 @@ OVB as well. ``"physical_network": ""`` with ``"physical_network": "ctlplane"``. -#. The router addresses in the environment are dynamically allocated. For - convenience these are made available via the ``network_environment_data`` - key in the stack output of the quintupleo heat stack. To retrieve this data - run the ``openstack stack show`` command. For example:: +#. For convenience router addresses are made available via the + ``network_environment_data`` key in the stack output of the quintupleo heat + stack. To retrieve this data run the ``openstack stack show`` command. For + example:: $ openstack stack show quintupleo -c outputs -f yaml @@ -244,15 +244,15 @@ OVB as well. output_value: internal2_router: 172.17.1.204 internal_router_address: 172.17.0.201 - provision2_router: 192.0.3.206 - provision3_router: 192.0.4.204 - provision_router: 192.0.2.203 - storage2_router_address: 172.18.1.209 - storage_mgmt2_router_address: 172.19.1.206 - storage_mgmt_router_address: 172.19.0.209 - storage_router_address: 172.18.0.208 - tenant2_router_address: 172.16.1.200 - tenant_router_address: 172.16.0.201 + provision2_router: 192.168.25.254 + provision3_router: 192.168.26.254 + provision_router: 192.168.24.254 + storage2_router_address: 172.18.1.254 + storage_mgmt2_router_address: 172.19.1.254 + storage_mgmt_router_address: 172.19.0.254 + storage_router_address: 172.18.0.254 + tenant2_router_address: 172.16.1.254 + tenant_router_address: 172.16.0.254 - description: ip of the undercloud instance on the private network output_key: undercloud_host_private_ip output_value: 10.0.1.14 @@ -272,33 +272,33 @@ OVB as well. undercloud_hostname = undercloud.rdocloud local_interface = eth1 local_mtu = 1450 - local_ip = 192.0.2.1/24 - undercloud_public_host = 192.0.2.2 - undercloud_admin_host = 192.0.2.3 + local_ip = 192.168.24.1/24 + undercloud_public_host = 192.168.24.2 + undercloud_admin_host = 192.168.24.3 undercloud_nameservers = 8.8.8.8,8.8.4.4 local_subnet = provision subnets = provision,provision2,provision3 [provision] - cidr = 192.0.2.0/24 - dhcp_start = 192.0.2.10 - dhcp_end = 192.0.2.30 - gateway = 192.0.2.203 - inspection_iprange = 192.0.2.100,192.0.2.120 + cidr = 192.168.24.0/24 + dhcp_start = 192.168.24.10 + dhcp_end = 192.168.24.30 + gateway = 192.168.24.254 + inspection_iprange = 192.168.24.100,192.168.24.120 masquerade = true [provision2] - cidr = 192.0.3.0/24 - dhcp_start = 192.0.3.10 - dhcp_end = 192.0.3.30 - gateway = 192.0.3.206 - inspection_iprange = 192.0.3.100,192.0.3.120 + cidr = 192.168.25.0/24 + dhcp_start = 192.168.25.10 + dhcp_end = 192.168.25.30 + gateway = 192.168.25.254 + inspection_iprange = 192.168.25.100,192.168.25.120 masquerade = true [provision3] - cidr = 192.0.4.0/24 - dhcp_start = 192.0.4.10 - dhcp_end = 192.0.4.30 - gateway = 192.0.4.204 - inspection_iprange = 192.0.4.100,192.0.4.120 + cidr = 192.168.26.0/24 + dhcp_start = 192.168.26.10 + dhcp_end = 192.168.26.30 + gateway = 192.168.26.254 + inspection_iprange = 192.168.26.100,192.168.26.120 masquerade = true diff --git a/ipv6-network-templates/network-environment.yaml b/ipv6-network-templates/network-environment.yaml index 824081a..d845650 100644 --- a/ipv6-network-templates/network-environment.yaml +++ b/ipv6-network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 2001:db8:fd00:1000::/64 ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}] ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000::1 diff --git a/ipv6-network-templates/ui-settings.pickle b/ipv6-network-templates/ui-settings.pickle index bc3ac5a..725c716 100644 --- a/ipv6-network-templates/ui-settings.pickle +++ b/ipv6-network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/network-templates/network-environment.yaml b/network-templates/network-environment.yaml index 05b0d1f..466aa80 100644 --- a/network-templates/network-environment.yaml +++ b/network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/network-templates/ui-settings.pickle b/network-templates/ui-settings.pickle index 0b71d5c..195eabc 100644 --- a/network-templates/ui-settings.pickle +++ b/network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/overcloud-templates/bond-network-templates/network-environment.yaml b/overcloud-templates/bond-network-templates/network-environment.yaml index 3d81639..a4f4a1f 100644 --- a/overcloud-templates/bond-network-templates/network-environment.yaml +++ b/overcloud-templates/bond-network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/overcloud-templates/bond-network-templates/ui-settings.pickle b/overcloud-templates/bond-network-templates/ui-settings.pickle index 74ec540..22bfce2 100644 --- a/overcloud-templates/bond-network-templates/ui-settings.pickle +++ b/overcloud-templates/bond-network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/overcloud-templates/ipv6-network-templates/network-environment.yaml b/overcloud-templates/ipv6-network-templates/network-environment.yaml index 824081a..d845650 100644 --- a/overcloud-templates/ipv6-network-templates/network-environment.yaml +++ b/overcloud-templates/ipv6-network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 2001:db8:fd00:1000::/64 ExternalAllocationPools: [{"start": "2001:db8:fd00:1000::10", "end": "2001:db8:fd00:1000:ffff:ffff:ffff:fffe"}] ExternalInterfaceDefaultRoute: 2001:db8:fd00:1000::1 diff --git a/overcloud-templates/ipv6-network-templates/ui-settings.pickle b/overcloud-templates/ipv6-network-templates/ui-settings.pickle index 556326c..ff60aee 100644 --- a/overcloud-templates/ipv6-network-templates/ui-settings.pickle +++ b/overcloud-templates/ipv6-network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/overcloud-templates/network-templates/network-environment.yaml b/overcloud-templates/network-templates/network-environment.yaml index 05b0d1f..466aa80 100644 --- a/overcloud-templates/network-templates/network-environment.yaml +++ b/overcloud-templates/network-templates/network-environment.yaml @@ -8,8 +8,8 @@ resource_registry: parameter_defaults: ControlPlaneSubnetCidr: '24' - ControlPlaneDefaultRoute: 192.0.2.1 - EC2MetadataIp: 192.0.2.1 + ControlPlaneDefaultRoute: 192.168.24.1 + EC2MetadataIp: 192.168.24.1 ExternalNetCidr: 10.0.0.0/24 ExternalAllocationPools: [{"start": "10.0.0.10", "end": "10.0.0.50"}] ExternalInterfaceDefaultRoute: 10.0.0.1 diff --git a/overcloud-templates/network-templates/ui-settings.pickle b/overcloud-templates/network-templates/ui-settings.pickle index a70c44a..9ff60a0 100644 --- a/overcloud-templates/network-templates/ui-settings.pickle +++ b/overcloud-templates/network-templates/ui-settings.pickle @@ -7,14 +7,14 @@ p3 (dp4 S'route' p5 -V192.0.2.1 +V192.168.24.1 p6 sS'mask' p7 I24 sS'ec2' p8 -V192.0.2.1 +V192.168.24.1 p9 ssS'major' p10 diff --git a/templates/dhcp-relay.yaml b/templates/dhcp-relay.yaml index 325d268..b54e17f 100644 --- a/templates/dhcp-relay.yaml +++ b/templates/dhcp-relay.yaml @@ -21,9 +21,6 @@ parameters: dhcp_ips: type: json - default: - - 192.0.2.1 - - 192.0.2.10 description: | The IP addresses of DHCP servers to relay DHCP requests to. diff --git a/templates/quintupleo.yaml b/templates/quintupleo.yaml index ed0af86..b7e665c 100644 --- a/templates/quintupleo.yaml +++ b/templates/quintupleo.yaml @@ -144,8 +144,8 @@ parameters: dhcp_ips: type: json default: - - 192.0.2.1 - - 192.0.2.10 + - 192.168.24.1 + - 192.168.24.10 description: | The IP addresses of DHCP servers to relay DHCP requests to. diff --git a/templates/undercloud-networks-routed.yaml b/templates/undercloud-networks-routed.yaml index 19f86ac..b66aecb 100644 --- a/templates/undercloud-networks-routed.yaml +++ b/templates/undercloud-networks-routed.yaml @@ -9,12 +9,12 @@ parameters: provision_net_cidr: type: string description: CIDR for provision network subnet - default: 192.0.2.0/24 + default: 192.168.24.0/24 provision_net_router_address: type: string description: Router address for the provision network subnet - default: 192.0.2.254 + default: 192.168.24.254 provision_net_shared: type: boolean @@ -29,12 +29,12 @@ parameters: provision_net2_cidr: type: string description: CIDR for second provision network subnet - default: 192.0.3.0/24 + default: 192.168.25.0/24 provision_net2_router_address: type: string description: Router address for the provision network subnet - default: 192.0.3.254 + default: 192.168.25.254 provision_net2_shared: type: boolean @@ -49,12 +49,12 @@ parameters: provision_net3_cidr: type: string description: CIDR for third provision network subnet - default: 192.0.4.0/24 + default: 192.168.26.0/24 provision_net3_router_address: type: string description: Router address for the provision network subnet - default: 192.0.4.254 + default: 192.168.26.254 provision_net3_shared: type: boolean diff --git a/templates/undercloud-networks.yaml b/templates/undercloud-networks.yaml index b0131f6..4f9bc34 100644 --- a/templates/undercloud-networks.yaml +++ b/templates/undercloud-networks.yaml @@ -9,7 +9,7 @@ parameters: provision_net_cidr: type: string description: CIDR for provision network subnet - default: 192.0.2.0/24 + default: 192.168.24.0/24 provision_net_shared: type: boolean diff --git a/templates/virtual-baremetal.yaml b/templates/virtual-baremetal.yaml index dcb2a00..84fad04 100644 --- a/templates/virtual-baremetal.yaml +++ b/templates/virtual-baremetal.yaml @@ -117,8 +117,8 @@ parameters: dhcp_ips: type: json default: - - 192.0.2.1 - - 192.0.2.10 + - 192.168.24.1 + - 192.168.24.10 description: | The IP addresses of DHCP servers to relay DHCP requests to.