diff options
| author |   Dan Radez <dradez@redhat.com> | 2016-11-30 13:57:50 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2016-11-30 13:57:50 +0000 |
| commit | a977ce7a518ee2a31262f95c30713cef9c944be7 (patch) | |
| tree | 7b5991b21a03b68cd4b001121971bb788c31ae0d /config/network/network_settings_vlans.yaml | |
| parent | d903ea48e7965de5751571202afd477dd953c257 (diff) | |
| parent | 52e4c1928f514856e3f9d4d6ff391ac5e4a270ca (diff) | |
Merge "Renames 'usable_ip_range' to 'overcloud_ip_range'"
Diffstat (limited to 'config/network/network_settings_vlans.yaml')
| -rw-r--r-- | config/network/network_settings_vlans.yaml | 10 |
1 files changed, 5 insertions, 5 deletions
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. |