summaryrefslogtreecommitdiffstats
path: root/config/network
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2016-11-29 16:54:10 -0500
committerTim Rozet <trozet@redhat.com>2016-11-29 16:54:10 -0500
commit52e4c1928f514856e3f9d4d6ff391ac5e4a270ca (patch)
treeff565b49ce7034220ae492b66b7b58d2732b2364 /config/network
parentc3d74dbf05ee8b0c161190b85eb1e238a69402a7 (diff)
Renames 'usable_ip_range' to 'overcloud_ip_range'
'usable_ip_range' was confusing for a lot of users, and most thought it encompassed all of the defined ranges in the network settings file (like floating_ip_range and introspection_range). This renames it to be more accurate. JIRA: APEX-288 Change-Id: I2e106666df1bfd007f150279e2e0387a64cd0f48 Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'config/network')
-rw-r--r--config/network/network_settings.yaml8
-rw-r--r--config/network/network_settings_v6.yaml6
-rw-r--r--config/network/network_settings_vlans.yaml10
3 files changed, 12 insertions, 12 deletions
diff --git a/config/network/network_settings.yaml b/config/network/network_settings.yaml
index 6cf9ae80..c052a438 100644
--- a/config/network/network_settings.yaml
+++ b/config/network/network_settings.yaml
@@ -66,7 +66,7 @@ networks: # Network configurations
- em1 # Member Interface to bridge to for installer VM (use multiple values for bond)
vlan: native # VLAN tag to use for this network on Installer VM, native means none
ip: 192.0.2.1 # IP to assign to Installer VM on this network
- usable_ip_range:
+ overcloud_ip_range:
- 192.0.2.11
- 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.
@@ -121,7 +121,7 @@ networks: # Network configurations
floating_ip_range:
- 192.168.37.200
- 192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range:
+ overcloud_ip_range:
- 192.168.37.10
- 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.
@@ -154,7 +154,7 @@ networks: # Network configurations
floating_ip_range:
- 192.168.38.200
- 192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range:
+ overcloud_ip_range:
- 192.168.38.10
- 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.
@@ -214,4 +214,4 @@ apex:
admin:
introspection_range:
- 192.0.2.100
- - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range.
+ - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range.
diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml
index b12614f1..6b1dd5de 100644
--- a/config/network/network_settings_v6.yaml
+++ b/config/network/network_settings_v6.yaml
@@ -66,7 +66,7 @@ networks: # Network configurations
- em1 # Member Interface to bridge to for installer VM (use multiple values for bond)
vlan: native # VLAN tag to use for this network on Installer VM, native means none
ip: 192.0.2.1 # IP to assign to Installer VM on this network
- usable_ip_range:
+ overcloud_ip_range:
- 192.0.2.11
- 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).
@@ -76,7 +76,7 @@ networks: # Network configurations
dhcp_range:
- 192.0.2.2
- 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.
+ # Cannot overlap with overcloud_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)
@@ -177,4 +177,4 @@ apex:
admin:
introspection_range:
- 192.0.2.100
- - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range.
+ - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range.
diff --git a/config/network/network_settings_vlans.yaml b/config/network/network_settings_vlans.yaml
index c5143641..4e3da2f4 100644
--- a/config/network/network_settings_vlans.yaml
+++ b/config/network/network_settings_vlans.yaml
@@ -66,7 +66,7 @@ networks: # Network configurations
- em1 # Member Interface to bridge to for installer VM (use multiple values for bond)
vlan: native # VLAN tag to use for this network on Installer VM, native means none
ip: 192.0.2.1 # IP to assign to Installer VM on this network
- usable_ip_range:
+ overcloud_ip_range:
- 192.0.2.11
- 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.
@@ -76,7 +76,7 @@ networks: # Network configurations
dhcp_range:
- 192.0.2.2
- 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.
+ # Cannot overlap with overcloud_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)
@@ -122,7 +122,7 @@ networks: # Network configurations
floating_ip_range:
- 192.168.37.200
- 192.168.37.220 # Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range:
+ overcloud_ip_range:
- 192.168.37.10
- 192.168.37.199 # Usable IP range on the public network, usually this is a shared subnet
nic_mapping: # Mapping of network configuration for Overcloud Nodes
@@ -154,7 +154,7 @@ networks: # Network configurations
floating_ip_range:
- 192.168.38.200
- 192.168.38.220 # Range to allocate to floating IPs for the public network with Neutron
- usable_ip_range:
+ overcloud_ip_range:
- 192.168.38.10
- 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.
@@ -214,4 +214,4 @@ apex:
admin:
introspection_range:
- 192.0.2.100
- - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or usable_ip_range.
+ - 192.0.2.120 # Range used for introspection phase (examining nodes). This cannot overlap with dhcp_range or overcloud_ip_range.