summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDan Radez <dradez@redhat.com>2016-11-30 13:57:50 +0000
committerGerrit Code Review <gerrit@opnfv.org>2016-11-30 13:57:50 +0000
commita977ce7a518ee2a31262f95c30713cef9c944be7 (patch)
tree7b5991b21a03b68cd4b001121971bb788c31ae0d
parentd903ea48e7965de5751571202afd477dd953c257 (diff)
parent52e4c1928f514856e3f9d4d6ff391ac5e4a270ca (diff)
Merge "Renames 'usable_ip_range' to 'overcloud_ip_range'"
-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
-rwxr-xr-xlib/post-install-functions.sh2
-rw-r--r--lib/python/apex/network_environment.py8
-rw-r--r--lib/python/apex/network_settings.py2
6 files changed, 18 insertions, 18 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.
diff --git a/lib/post-install-functions.sh b/lib/post-install-functions.sh
index d396f8bf..1055994e 100755
--- a/lib/post-install-functions.sh
+++ b/lib/post-install-functions.sh
@@ -39,7 +39,7 @@ EOI
else
echo -e "${blue}INFO: OVS Bridge ${NET_MAP[$network]} missing IP, will configure${reset}"
# use last IP of allocation pool
- eval "ip_range=\${${network}_usable_ip_range}"
+ eval "ip_range=\${${network}_overcloud_ip_range}"
ovs_ip=${ip_range##*,}
eval "net_cidr=\${${network}_cidr}"
if [[ $ovs_ip =~ ^[0-9]+\.[0-9]+\.[0-9]+\.[0-9]+$ ]]; then
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index ae5c602c..b931a758 100644
--- a/lib/python/apex/network_environment.py
+++ b/lib/python/apex/network_environment.py
@@ -93,7 +93,7 @@ class NetworkEnvironment(dict):
self[param_def]['NeutronExternalNetworkBridge'] = '""'
self[param_def]['ExternalNetworkVlanID'] = \
nets[EXTERNAL_NETWORK][0]['installer_vm']['vlan']
- external_range = nets[EXTERNAL_NETWORK][0]['usable_ip_range']
+ external_range = nets[EXTERNAL_NETWORK][0]['overcloud_ip_range']
self[param_def]['ExternalAllocationPools'] = \
[{'start': str(external_range[0]),
'end': str(external_range[1])}]
@@ -111,7 +111,7 @@ class NetworkEnvironment(dict):
self._config_resource_reg(EXTERNAL_RESOURCES, postfix)
if TENANT_NETWORK in enabled_nets:
- tenant_range = nets[TENANT_NETWORK]['usable_ip_range']
+ tenant_range = nets[TENANT_NETWORK]['overcloud_ip_range']
self[param_def]['TenantAllocationPools'] = \
[{'start': str(tenant_range[0]),
'end': str(tenant_range[1])}]
@@ -132,7 +132,7 @@ class NetworkEnvironment(dict):
self._config_resource_reg(TENANT_RESOURCES, postfix)
if STORAGE_NETWORK in enabled_nets:
- storage_range = nets[STORAGE_NETWORK]['usable_ip_range']
+ storage_range = nets[STORAGE_NETWORK]['overcloud_ip_range']
self[param_def]['StorageAllocationPools'] = \
[{'start': str(storage_range[0]),
'end': str(storage_range[1])}]
@@ -152,7 +152,7 @@ class NetworkEnvironment(dict):
self._config_resource_reg(STORAGE_RESOURCES, postfix)
if API_NETWORK in enabled_nets:
- api_range = nets[API_NETWORK]['usable_ip_range']
+ api_range = nets[API_NETWORK]['overcloud_ip_range']
self[param_def]['InternalApiAllocationPools'] = \
[{'start': str(api_range[0]),
'end': str(api_range[1])}]
diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py
index c9f7d450..951000dc 100644
--- a/lib/python/apex/network_settings.py
+++ b/lib/python/apex/network_settings.py
@@ -99,7 +99,7 @@ class NetworkSettings(dict):
iface = nicmap[CONTROLLER]['members'][0]
self._config_ip_range(network=network,
interface=iface,
- ip_range='usable_ip_range',
+ ip_range='overcloud_ip_range',
start_offset=21, end_offset=21)
self.enabled_network_list.append(network)
self._validate_overcloud_nic_order(network)