diff --git a/doc/source/user/ceph/full-deploy.rst b/doc/source/user/ceph/full-deploy.rst index b7f75d9d0f..9b1a04581d 100644 --- a/doc/source/user/ceph/full-deploy.rst +++ b/doc/source/user/ceph/full-deploy.rst @@ -75,11 +75,11 @@ environment. +==================+================+===================+================+ | lb_vip_address | 172.29.236.9 | | | +------------------+----------------+-------------------+----------------+ -| infra1 | 172.29.236.11 | | | +| infra1 | 172.29.236.11 | 172.29.240.11 | | +------------------+----------------+-------------------+----------------+ -| infra2 | 172.29.236.12 | | | +| infra2 | 172.29.236.12 | 172.29.240.12 | | +------------------+----------------+-------------------+----------------+ -| infra3 | 172.29.236.13 | | | +| infra3 | 172.29.236.13 | 172.29.240.13 | | +------------------+----------------+-------------------+----------------+ | log1 | 172.29.236.14 | | | +------------------+----------------+-------------------+----------------+ diff --git a/doc/source/user/l3pods/example.rst b/doc/source/user/l3pods/example.rst index 2e0f3cedf7..0bd3ea3fe4 100644 --- a/doc/source/user/l3pods/example.rst +++ b/doc/source/user/l3pods/example.rst @@ -74,11 +74,11 @@ environment. +==================+================+===================+================+ | lb_vip_address | 172.29.236.9 | | | +------------------+----------------+-------------------+----------------+ -| infra1 | 172.29.236.10 | | | +| infra1 | 172.29.236.10 | 172.29.237.10 | | +------------------+----------------+-------------------+----------------+ -| infra2 | 172.29.239.10 | | | +| infra2 | 172.29.239.10 | 172.29.240.10 | | +------------------+----------------+-------------------+----------------+ -| infra3 | 172.29.242.10 | | | +| infra3 | 172.29.242.10 | 172.29.243.10 | | +------------------+----------------+-------------------+----------------+ | log1 | 172.29.236.11 | | | +------------------+----------------+-------------------+----------------+ diff --git a/doc/source/user/prod/example.rst b/doc/source/user/prod/example.rst index b0ce936f45..f06057f65a 100644 --- a/doc/source/user/prod/example.rst +++ b/doc/source/user/prod/example.rst @@ -54,11 +54,11 @@ environment. +==================+================+===================+================+ | lb_vip_address | 172.29.236.9 | | | +------------------+----------------+-------------------+----------------+ -| infra1 | 172.29.236.11 | | | +| infra1 | 172.29.236.11 | 172.29.240.11 | | +------------------+----------------+-------------------+----------------+ -| infra2 | 172.29.236.12 | | | +| infra2 | 172.29.236.12 | 172.29.240.12 | | +------------------+----------------+-------------------+----------------+ -| infra3 | 172.29.236.13 | | | +| infra3 | 172.29.236.13 | 172.29.240.13 | | +------------------+----------------+-------------------+----------------+ | log1 | 172.29.236.14 | | | +------------------+----------------+-------------------+----------------+ diff --git a/doc/source/user/test/example.rst b/doc/source/user/test/example.rst index 2643cfea9b..53cbafacd4 100644 --- a/doc/source/user/test/example.rst +++ b/doc/source/user/test/example.rst @@ -46,7 +46,7 @@ environment. +------------------+----------------+-------------------+----------------+ | Host name | Management IP | Tunnel (VxLAN) IP | Storage IP | +==================+================+===================+================+ -| infra1 | 172.29.236.11 | | | +| infra1 | 172.29.236.11 | 172.29.240.11 | | +------------------+----------------+-------------------+----------------+ | compute1 | 172.29.236.12 | 172.29.240.12 | 172.29.244.12 | +------------------+----------------+-------------------+----------------+ @@ -104,4 +104,3 @@ OpenStack endpoints are served with the same protocol. This is done with the following content: .. literalinclude:: ../../../../etc/openstack_deploy/user_variables.yml.test.example - diff --git a/etc/network/interfaces.d/openstack_interface.cfg.pod.example b/etc/network/interfaces.d/openstack_interface.cfg.pod.example index 0cbb172443..4956a60740 100644 --- a/etc/network/interfaces.d/openstack_interface.cfg.pod.example +++ b/etc/network/interfaces.d/openstack_interface.cfg.pod.example @@ -77,27 +77,17 @@ iface br-mgmt inet static # OpenStack Networking VXLAN (tunnel/overlay) bridge # -# Only the COMPUTE and NETWORK nodes must have an IP address -# on this bridge. When used by infrastructure nodes, the -# IP addresses are assigned to containers which use this -# bridge. +# The COMPUTE, NETWORK and INFRA nodes must have an IP address +# on this bridge. # auto br-vxlan -iface br-vxlan inet manual +iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 bridge_ports bond1.30 - -# compute1 VXLAN (tunnel/overlay) bridge config -#auto br-vxlan -#iface br-vxlan inet static -# bridge_stp off -# bridge_waitport 0 -# bridge_fd 0 -# bridge_ports bond1.30 -# address 172.29.246.10 -# netmask 255.255.255.0 + address 172.29.237.10 + netmask 255.255.252.0 # OpenStack Networking VLAN bridge auto br-vlan diff --git a/etc/network/interfaces.d/openstack_interface.cfg.prod.example b/etc/network/interfaces.d/openstack_interface.cfg.prod.example index b95159962d..c23f42beeb 100644 --- a/etc/network/interfaces.d/openstack_interface.cfg.prod.example +++ b/etc/network/interfaces.d/openstack_interface.cfg.prod.example @@ -77,27 +77,18 @@ iface br-mgmt inet static # OpenStack Networking VXLAN (tunnel/overlay) bridge # -# Only the COMPUTE and NETWORK nodes must have an IP address -# on this bridge. When used by infrastructure nodes, the -# IP addresses are assigned to containers which use this -# bridge. +# The COMPUTE, NETWORK and INFRA nodes must have an IP address +# on this bridge. # + auto br-vxlan -iface br-vxlan inet manual +iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 bridge_ports bond1.30 - -# compute1 VXLAN (tunnel/overlay) bridge config -#auto br-vxlan -#iface br-vxlan inet static -# bridge_stp off -# bridge_waitport 0 -# bridge_fd 0 -# bridge_ports bond1.30 -# address 172.29.240.16 -# netmask 255.255.252.0 + address 172.29.240.16 + netmask 255.255.252.0 # OpenStack Networking VLAN bridge auto br-vlan diff --git a/etc/network/interfaces.d/openstack_interface.cfg.test.example b/etc/network/interfaces.d/openstack_interface.cfg.test.example index d9e7888575..e95d2056f1 100644 --- a/etc/network/interfaces.d/openstack_interface.cfg.test.example +++ b/etc/network/interfaces.d/openstack_interface.cfg.test.example @@ -45,27 +45,17 @@ iface br-mgmt:0 inet static # OpenStack Networking VXLAN (tunnel/overlay) bridge # -# Only the COMPUTE and NETWORK nodes must have an IP address -# on this bridge. When used by infrastructure nodes, the -# IP addresses are assigned to containers which use this -# bridge. +# The COMPUTE, NETWORK and INFRA nodes must have an IP address +# on this bridge. # auto br-vxlan -iface br-vxlan inet manual +iface br-vxlan inet static bridge_stp off bridge_waitport 0 bridge_fd 0 - bridge_ports eth0.30 - -# compute1 VXLAN (tunnel/overlay) bridge config -#auto br-vxlan -#iface br-vxlan inet static -# bridge_stp off -# bridge_waitport 0 -# bridge_fd 0 -# bridge_ports eth0.30 -# address 172.29.240.12 -# netmask 255.255.252.0 + bridge_ports bond1.30 + address 172.29.240.11 + netmask 255.255.252.0 # OpenStack Networking VLAN bridge auto br-vlan