summaryrefslogtreecommitdiffstats
path: root/lib/python/apex/network_environment.py
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 /lib/python/apex/network_environment.py
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 'lib/python/apex/network_environment.py')
-rw-r--r--lib/python/apex/network_environment.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/python/apex/network_environment.py b/lib/python/apex/network_environment.py
index ae5c602..b931a75 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])}]