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>

1 files changed, 18 insertions, 0 deletions

diff --git a/config/network/network_settings_v6.yaml b/config/network/network_settings_v6.yaml
index 8ca5eaca..dd2d066e 100644
--- a/config/network/network_settings_v6.yaml
+++ b/config/network/network_settings_v6.yaml
@@ -30,12 +30,15 @@ dns_servers: ["8.8.8.8", "8.8.4.4"]
 # network is used as the OpenStack management network which
 # carries e.g. communication between its internal components.
 # This network must be IPv4 currently.
+domain_name: 'opnfvapex.com'
 
 admin_network:
   enabled: true
   network_type: bridged
   bridged_interface: ''
   bond_interfaces: ''
+  compute_interface: nic1
+  controller_interface: nic1
   vlan: native
   usable_ip_range: 192.0.2.11,192.0.2.99
   gateway: 192.0.2.1
@@ -53,6 +56,11 @@ admin_network:
 private_network:
   enabled: true
   cidr: 11.0.0.0/24
+  vlan: native
+  cidr: 11.0.0.0/24
+  compute_interface: nic2
+  controller_interface: nic2
+
 
 # "public" network is used for external connectivity.
 # The external network provides Internet access for virtual
@@ -65,6 +73,9 @@ public_network:
   enabled: true
   network_type: ''
   bridged_interface: ''
+  compute_interface: nic3
+  controller_interface: nic3
+  vlan: native
   cidr: 2001:db8::/64
   gateway: 2001:db8::1
   provisioner_ip: 2001:db8::1
@@ -76,11 +87,18 @@ public_network:
 storage_network:
   enabled: true
   cidr: fd00:fd00:fd00:2000::/64
+  vlan: native
+  compute_interface: nic4
+  controller_interface: nic4
+
 
 # "api" is an optional network used by internal openstack api services.
 api_network:
   enabled: true
   cidr: fd00:fd00:fd00:4000::/64
+  vlan: native
+  compute_interface: nic5
+  controller_interface: nic5
 
 #public_network:
 #  enabled: true                                     #If disabled, public_network traffic will collapse to admin network