summaryrefslogtreecommitdiffstats
path: root/config
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-10-24 14:31:35 -0400
committerTim Rozet <trozet@redhat.com>2016-10-25 15:02:41 +0000
commit78cb6738c1c71d64227e8c433b16380e9fe7a877 (patch)
tree202c55204ce40190fb39b34d8e08392b28d3611f /config
parent4e0df0f248a8c1cdb301ac35e6bb2b308e031320 (diff)
Clarifies ip ranges in network settings
Also includes other various fixes. JIRA: APEX-292 Change-Id: I5e8cedce5af43544963c1e7de582e7646b1c841a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config')
-rw-r--r--config/network/network_settings.yaml45
-rw-r--r--config/network/network_settings_v6.yaml40
-rw-r--r--config/network/network_settings_vlans.yaml42
3 files changed, 59 insertions, 68 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index ab9ed96..6cf9ae8 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -56,6 +56,7 @@ syslog:
server: 10.128.1.24
transport: 'tcp'
+# Common network settings
networks: # Network configurations
admin: # Admin configuration (pxe and jumpstart),
enabled: true
@@ -67,7 +68,9 @@ networks: # Network configurations
ip: 192.0.2.1 # IP to assign to Installer VM on this network
usable_ip_range:
- 192.0.2.11
- - 192.0.2.99 # Usable ip range, if empty entire range is usable
+ - 192.0.2.99 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be
+ # used for host bridge (i.e. br-admin). If empty entire range is usable.
+ # Cannot overlap with dhcp_range or introspection_range.
gateway: 192.0.2.1 # Gateway (only needed when public_network is disabled)
cidr: 192.0.2.0/24 # Subnet in CIDR format 192.168.1.0/24
dhcp_range:
@@ -79,14 +82,14 @@ networks: # Network configurations
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic1
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
members:
- nic1
#
tenant: # Tenant network configuration
enabled: true
cidr: 11.0.0.0/24 # Subnet in CIDR format 192.168.1.0/24
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Tenant network MTU
overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range:
# VNI, VLAN-ID, etc.
segmentation_type: vxlan # Tenant network segmentation type:
@@ -106,7 +109,7 @@ networks: # Network configurations
external: # Can contain 1 or more external networks
- public: # "public" network will be the network the installer VM attaches to
enabled: true
- mtu: 64000 # Public network MTU
+ mtu: 1500 # Public network MTU
installer_vm: # Network settings for the Installer VM on admin network (note only valid on 'public' external network)
nic_type: interface # Indicates if this VM will be bridged to an interface, or to a bond
vlan: native
@@ -117,10 +120,11 @@ networks: # Network configurations
gateway: 192.168.37.1
floating_ip_range:
- 192.168.37.200
- - 192.168.37.220 #Range to allocate to floating IPs for the public network with Neutron
+ - 192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron
usable_ip_range:
- 192.168.37.10
- - 192.168.37.199 # Usable IP range on the public network, usually this is a shared subnet
+ - 192.168.37.199 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be used for host
+ # bridge (i.e. br-public). If empty entire range is usable. Cannot overlap with dhcp_range or introspection_range.
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
@@ -138,7 +142,7 @@ networks: # Network configurations
gateway: 192.168.37.1
- private_cloud: # another external network
enabled: false
- mtu: 64000
+ mtu: 1500
installer_vm: # Network settings for the Installer VM on admin network (note only valid on 'public' external network)
nic_type: interface # Indicates if this VM will be bridged to an interface, or to a bond
vlan: 101
@@ -149,10 +153,11 @@ networks: # Network configurations
gateway: 192.168.38.1
floating_ip_range:
- 192.168.38.200
- - 192.168.38.220 #Range to allocate to floating IPs for the public network with Neutron
+ - 192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron
usable_ip_range:
- 192.168.38.10
- - 192.168.38.199 # Usable IP range on the public network, usually this is a shared subnet
+ - 192.168.38.199 # Usable IP range for overcloud nodes (including VIPs), usually this is a shared subnet.
+ # Cannot overlap with dhcp_range or introspection_range.
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
@@ -173,15 +178,15 @@ networks: # Network configurations
storage: # Storage network configuration
enabled: true
cidr: 12.0.0.0/24 # Subnet in CIDR format
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Storage network MTU
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
- phys_type: bond # Physical interface type (interface or bond)
+ phys_type: interface # Physical interface type (interface or bond)
vlan: native # VLAN tag to use with this NIC
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic4 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
vlan: native
members:
- nic4
@@ -190,31 +195,23 @@ networks: # Network configurations
enabled: false
cidr: fd00:fd00:fd00:4000::/64 # Subnet in CIDR format
vlan: 13 # VLAN tag to use for Overcloud hosts on this network
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Api network MTU
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
- phys_type: bond # Physical interface type (interface or bond)
+ phys_type: interface # Physical interface type (interface or bond)
vlan: native # VLAN tag to use with this NIC
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic5 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
vlan: native
members:
- nic5
-# JOID specific settings
-joid:
-
-# Compass specific settings
-compass:
-
# Apex specific settings
apex:
networks:
admin:
introspection_range:
- 192.0.2.100
- - 192.0.2.120 # Range used for introspection phase (examining nodes)
-# Fuel specific settings
-fuel:
+ - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range.
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml
index bfce3ab..b12614f 100644
--- a/config/network/network_settings_v6.yaml
+++ b/config/network/network_settings_v6.yaml
@@ -56,6 +56,7 @@ syslog:
server: 10.128.1.24
transport: 'tcp'
+# Common network settings
networks: # Network configurations
admin: # Admin configuration (pxe and jumpstart),
enabled: true
@@ -67,26 +68,29 @@ networks: # Network configurations
ip: 192.0.2.1 # IP to assign to Installer VM on this network
usable_ip_range:
- 192.0.2.11
- - 192.0.2.99 # Usable ip range, if empty entire range is usable
+ - 192.0.2.99 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be
+ # used for host bridge (i.e. br-admin).
+ # If empty entire range is usable. Cannot overlap with dhcp_range or introspection_range.
gateway: 192.0.2.1 # Gateway (only needed when public_network is disabled)
cidr: 192.0.2.0/24 # Subnet in CIDR format 192.168.1.0/24
dhcp_range:
- 192.0.2.2
- - 192.0.2.10 # DHCP range for the admin network, if empty it will be automatically provisioned
+ - 192.0.2.10 # DHCP range for the admin network, if empty it will be automatically provisioned.
+ # Cannot overlap with usable_ip_range or introspection_range.
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic1
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
members:
- nic1
#
tenant: # Tenant network configuration
enabled: true
cidr: 11.0.0.0/24 # Subnet in CIDR format 192.168.1.0/24
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Tenant network MTU
overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range:
# VNI, VLAN-ID, etc.
segmentation_type: vxlan # Tenant network segmentation type:
@@ -106,7 +110,7 @@ networks: # Network configurations
external: # Can contain 1 or more external networks
- public: # "public" network will be the network the installer VM attaches to
enabled: true
- mtu: 64000 # Public network MTU
+ mtu: 1500 # Public network MTU
installer_vm: # Network settings for the Installer VM on admin network (note only valid on 'public' external network)
nic_type: interface # Indicates if this VM will be bridged to an interface, or to a bond
vlan: native
@@ -117,7 +121,7 @@ networks: # Network configurations
gateway: 2001:db8::1
floating_ip_range:
- 2001:db8:0:0:0:0:0:2
- - 2001:db8:0:0:ffff:ffff:ffff:ffff
+ - 2001:db8:0:0:ffff:ffff:ffff:ffff # Floating IPs range to assign to the overcloud (External IPs to be NAT'ed to Tenant IP)
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
@@ -137,15 +141,15 @@ networks: # Network configurations
storage: # Storage network configuration
enabled: true
cidr: fd00:fd00:fd00:2000::/64 # Subnet in CIDR format
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Storage network MTU
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
- phys_type: bond # Physical interface type (interface or bond)
+ phys_type: interface # Physical interface type (interface or bond)
vlan: native # VLAN tag to use with this NIC
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic4 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
vlan: native
members:
- nic4
@@ -154,31 +158,23 @@ networks: # Network configurations
enabled: true
cidr: fd00:fd00:fd00:4000::/64 # Subnet in CIDR format
vlan: 13 # VLAN tag to use for Overcloud hosts on this network
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Api network MTU
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
- phys_type: bond # Physical interface type (interface or bond)
- vlan: native # VLAN tag to use with this NIC
+ phys_type: interface # Physical interface type (interface or bond)
+ vlan: native # VLAN tag to use with this NIC
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic5 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
vlan: native
members:
- nic5
-# JOID specific settings
-joid:
-
-# Compass specific settings
-compass:
-
# Apex specific settings
apex:
networks:
admin:
introspection_range:
- 192.0.2.100
- - 192.0.2.120 # Range used for introspection phase (examining nodes)
-# Fuel specific settings
-fuel:
+ - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range.
diff --git a/config/network/network_settings_vlans.yaml b/config/network/network_settings_vlans.yaml
index beeae47..c514364 100644
--- a/config/network/network_settings_vlans.yaml
+++ b/config/network/network_settings_vlans.yaml
@@ -56,6 +56,7 @@ syslog:
server: 10.128.1.24
transport: 'tcp'
+# Common network settings
networks: # Network configurations
admin: # Admin configuration (pxe and jumpstart),
enabled: true
@@ -67,26 +68,29 @@ networks: # Network configurations
ip: 192.0.2.1 # IP to assign to Installer VM on this network
usable_ip_range:
- 192.0.2.11
- - 192.0.2.99 # Usable ip range, if empty entire range is usable
+ - 192.0.2.99 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be
+ # used for host bridge (i.e. br-admin). If empty entire range is usable.
+ # Cannot overlap with dhcp_range.
gateway: 192.0.2.1 # Gateway (only needed when public_network is disabled)
cidr: 192.0.2.0/24 # Subnet in CIDR format 192.168.1.0/24
dhcp_range:
- 192.0.2.2
- - 192.0.2.10 # DHCP range for the admin network, if empty it will be automatically provisioned
+ - 192.0.2.10 # DHCP range for the admin network, if empty it will be automatically provisioned.
+ # Cannot overlap with usable_ip_range or introspection_range.
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic1
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
members:
- nic1
#
tenant: # Tenant network configuration
enabled: true
cidr: 11.0.0.0/24 # Subnet in CIDR format 192.168.1.0/24
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Tenant network MTU
overlay_id_range: 2,65535 # Tenant network Overlay segmentation ID range:
# VNI, VLAN-ID, etc.
segmentation_type: vxlan # Tenant network segmentation type:
@@ -106,7 +110,7 @@ networks: # Network configurations
external: # Can contain 1 or more external networks
- public: # "public" network will be the network the installer VM attaches to
enabled: true
- mtu: 64000 # Public network MTU
+ mtu: 1500 # Public network MTU
installer_vm: # Network settings for the Installer VM on admin network (note only valid on 'public' external network)
nic_type: interface # Indicates if this VM will be bridged to an interface, or to a bond
vlan: 501
@@ -138,7 +142,7 @@ networks: # Network configurations
gateway: 192.168.37.1
- private_cloud: # another external network
enabled: false
- mtu: 64000
+ mtu: 1500
installer_vm: # Network settings for the Installer VM on admin network (note only valid on 'public' external network)
nic_type: interface # Indicates if this VM will be bridged to an interface, or to a bond
vlan: 501
@@ -152,7 +156,9 @@ networks: # Network configurations
- 192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron
usable_ip_range:
- 192.168.38.10
- - 192.168.38.199 # Usable IP range on the public network, usually this is a shared subnet
+ - 192.168.38.199 # Usable ip range for the overcloud node IPs (including VIPs) and last IP will be used for host
+ # bridge (i.e. br-public). If empty entire range is usable.
+ # Cannot overlap with dhcp_range or introspection_range.
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
phys_type: interface # Physical interface type (interface or bond)
@@ -173,15 +179,15 @@ networks: # Network configurations
storage: # Storage network configuration
enabled: true
cidr: 12.0.0.0/24 # Subnet in CIDR format
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Storage network MTU
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
- phys_type: bond # Physical interface type (interface or bond)
+ phys_type: interface # Physical interface type (interface or bond)
vlan: 201 # VLAN tag to use with this NIC
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic4 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
vlan: 201
members:
- nic4
@@ -189,31 +195,23 @@ networks: # Network configurations
api: # API network configuration
enabled: false
cidr: fd00:fd00:fd00:4000::/64 # Subnet in CIDR format
- mtu: 64000 # Tenant network MTU
+ mtu: 1500 # Api network MTU
nic_mapping: # Mapping of network configuration for Overcloud Nodes
compute: # Mapping for compute profile (nodes that will be used as Compute nodes)
- phys_type: bond # Physical interface type (interface or bond)
+ phys_type: interface # Physical interface type (interface or bond)
vlan: 101 # VLAN tag to use with this NIC
members: # Physical NIC members of this mapping (Single value allowed for interface phys_type)
- nic5 # Note, for Apex you may also use the logical nic name (found by nic order), such as "nic1"
controller: # Mapping for controller profile (nodes that will be used as Controller nodes)
- phys_type: bond
+ phys_type: interface
vlan: 101
members:
- nic5
-# JOID specific settings
-joid:
-
-# Compass specific settings
-compass:
-
# Apex specific settings
apex:
networks:
admin:
introspection_range:
- 192.0.2.100
- - 192.0.2.120 # Range used for introspection phase (examining nodes)
-# Fuel specific settings
-fuel:
+ - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range.