summaryrefslogtreecommitdiffstats
path: root/lib
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 /lib
parentd903ea48e7965de5751571202afd477dd953c257 (diff)
parent52e4c1928f514856e3f9d4d6ff391ac5e4a270ca (diff)
Merge "Renames 'usable_ip_range' to 'overcloud_ip_range'"
Diffstat (limited to 'lib')
-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
3 files changed, 6 insertions, 6 deletions
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)