summaryrefslogtreecommitdiffstats
path: root/lib/python
diff options
context:
space:
mode:
authorFeng Pan <fpan@redhat.com>2016-07-31 10:10:19 -0400
committerFeng Pan <fpan@redhat.com>2016-07-31 10:10:19 -0400
commitbf61379130ca7b39334b3aa05afbe76a4d6d78e5 (patch)
treee752149f901441854bc5e1c49a27fde3caba80ed /lib/python
parent31b10ea2994fc4d6614c0a31b0f54dbd58dc7abc (diff)
IPv6 fixes for network settings and post deploy
This patch contains the following: - Add dns and nic information in network settings file - Add ipv6 option for find_ip function in common-functions.sh - Change neutron commands to handle IPv6 during post deploy, skip NAT configuration if IPv6 is configured. - Fix an error in python library when generating floating ip range. JIRA: APEX-130 Change-Id: I27da7f7a714f42ee827be7091fcb1a6d89a0aae8 Signed-off-by: Feng Pan <fpan@redhat.com>
Diffstat (limited to 'lib/python')
-rw-r--r--lib/python/apex/network_settings.py4
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/apex/network_settings.py b/lib/python/apex/network_settings.py
index f2807664..c81256eb 100644
--- a/lib/python/apex/network_settings.py
+++ b/lib/python/apex/network_settings.py
@@ -223,7 +223,7 @@ class NetworkSettings:
- introspection_range
- public_network:
- provisioner_ip
- - floating_ip
+ - floating_ip_range
- gateway
"""
if network == constants.ADMIN_NETWORK:
@@ -236,7 +236,7 @@ class NetworkSettings:
elif network == constants.PUBLIC_NETWORK:
self._config_ip(network, 'provisioner_ip', 1)
self._config_ip_range(network=network,
- setting='floating_ip',
+ setting='floating_ip_range',
end_offset=2, count=20)
self._config_gateway(network)