openstack/openstack-ansible
Code Issues Proposed changes

Merge "Add IP addresses to infra node br-vxlan in the examples"

Browse Source
This commit is contained in:
Zuul 2018-04-18 15:58:50 +00:00 committed by Gerrit Code Review
commit b3fc00300d
7 changed files with 27 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
doc/source/user/ceph/full-deploy.rst
View File

@ -75,11 +75,11 @@ environment.
+==================+================+===================+================+ +==================+================+===================+================+
| lb_vip_address | 172.29.236.9 | | | | 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 | | | | log1 | 172.29.236.14 | | |
+------------------+----------------+-------------------+----------------+ +------------------+----------------+-------------------+----------------+

6
doc/source/user/l3pods/example.rst
View File

@ -74,11 +74,11 @@ environment.
+==================+================+===================+================+ +==================+================+===================+================+
| lb_vip_address | 172.29.236.9 | | | | 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 | | | | log1 | 172.29.236.11 | | |
+------------------+----------------+-------------------+----------------+ +------------------+----------------+-------------------+----------------+

6
doc/source/user/prod/example.rst
View File

@ -54,11 +54,11 @@ environment.
+==================+================+===================+================+ +==================+================+===================+================+
| lb_vip_address | 172.29.236.9 | | | | 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 | | | | log1 | 172.29.236.14 | | |
+------------------+----------------+-------------------+----------------+ +------------------+----------------+-------------------+----------------+

3
doc/source/user/test/example.rst
View File

@ -46,7 +46,7 @@ environment.
+------------------+----------------+-------------------+----------------+ +------------------+----------------+-------------------+----------------+
| Host name | Management IP | Tunnel (VxLAN) IP | Storage IP | | 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 | | 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: the following content:
.. literalinclude:: ../../../../etc/openstack_deploy/user_variables.yml.test.example .. literalinclude:: ../../../../etc/openstack_deploy/user_variables.yml.test.example

20
etc/network/interfaces.d/openstack_interface.cfg.pod.example
View File

@ -77,27 +77,17 @@ iface br-mgmt inet static
# OpenStack Networking VXLAN (tunnel/overlay) bridge # OpenStack Networking VXLAN (tunnel/overlay) bridge
# #
# Only the COMPUTE and NETWORK nodes must have an IP address # The COMPUTE, NETWORK and INFRA nodes must have an IP address
# on this bridge. When used by infrastructure nodes, the # on this bridge.
# IP addresses are assigned to containers which use this
# bridge.
# #
auto br-vxlan auto br-vxlan
iface br-vxlan inet manual iface br-vxlan inet static
bridge_stp off bridge_stp off
bridge_waitport 0 bridge_waitport 0
bridge_fd 0 bridge_fd 0
bridge_ports bond1.30 bridge_ports bond1.30
address 172.29.237.10
# compute1 VXLAN (tunnel/overlay) bridge config netmask 255.255.252.0
#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
# OpenStack Networking VLAN bridge # OpenStack Networking VLAN bridge
auto br-vlan auto br-vlan

21
etc/network/interfaces.d/openstack_interface.cfg.prod.example
View File

@ -77,27 +77,18 @@ iface br-mgmt inet static
# OpenStack Networking VXLAN (tunnel/overlay) bridge # OpenStack Networking VXLAN (tunnel/overlay) bridge
# #
# Only the COMPUTE and NETWORK nodes must have an IP address # The COMPUTE, NETWORK and INFRA nodes must have an IP address
# on this bridge. When used by infrastructure nodes, the # on this bridge.
# IP addresses are assigned to containers which use this
# bridge.
# #
auto br-vxlan auto br-vxlan
iface br-vxlan inet manual iface br-vxlan inet static
bridge_stp off bridge_stp off
bridge_waitport 0 bridge_waitport 0
bridge_fd 0 bridge_fd 0
bridge_ports bond1.30 bridge_ports bond1.30
address 172.29.240.16
# compute1 VXLAN (tunnel/overlay) bridge config netmask 255.255.252.0
#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
# OpenStack Networking VLAN bridge # OpenStack Networking VLAN bridge
auto br-vlan auto br-vlan

22
etc/network/interfaces.d/openstack_interface.cfg.test.example
View File

@ -45,27 +45,17 @@ iface br-mgmt:0 inet static
# OpenStack Networking VXLAN (tunnel/overlay) bridge # OpenStack Networking VXLAN (tunnel/overlay) bridge
# #
# Only the COMPUTE and NETWORK nodes must have an IP address # The COMPUTE, NETWORK and INFRA nodes must have an IP address
# on this bridge. When used by infrastructure nodes, the # on this bridge.
# IP addresses are assigned to containers which use this
# bridge.
# #
auto br-vxlan auto br-vxlan
iface br-vxlan inet manual iface br-vxlan inet static
bridge_stp off bridge_stp off
bridge_waitport 0 bridge_waitport 0
bridge_fd 0 bridge_fd 0
bridge_ports eth0.30 bridge_ports bond1.30
address 172.29.240.11
# compute1 VXLAN (tunnel/overlay) bridge config netmask 255.255.252.0
#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
# OpenStack Networking VLAN bridge # OpenStack Networking VLAN bridge
auto br-vlan auto br-vlan