Adapt network.yml to OpenStack Ansible

JIRA:COMPASS-557

1. modify sys_intf_mappings and ip_settings in
network.yml to synchronize with OSA network.
networks compass build will be mgmt, external,
tenant, storage.
2. modify compass_conf to support new netwok.yml
3. fix some hard coding when transfer ip parameters
4. support heterogeneous network

Change-Id: Ib4a8af1f96a40e6456242e3dc2b456e0c8c17c2e
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>

3 files changed, 81 insertions, 27 deletions

diff --git a/deploy/conf/vm_environment/huawei-virtual1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml
index ab485a8d..fe5f8b52 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network.yml
@@ -12,7 +12,7 @@ nic_mappings: []
 bond_mappings: []
 
 provider_net_mappings:
-  - name: br-prv
+  - name: br-provider
     network: physnet
     interface: eth1
     type: ovs
@@ -22,9 +22,15 @@ provider_net_mappings:
 
 sys_intf_mappings:
   - name: mgmt
+    interface: eth0
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
     interface: eth1
     vlan_tag: 101
-    type: vlan
     role:
       - controller
       - compute
@@ -32,14 +38,13 @@ sys_intf_mappings:
   - name: storage
     interface: eth1
     vlan_tag: 102
-    type: vlan
     role:
       - controller
       - compute
 
   - name: external
-    interface: br-prv
-    type: ovs
+    interface: eth1
+    vlan_tag: None
     role:
       - controller
       - compute
@@ -47,8 +52,21 @@ sys_intf_mappings:
 ip_settings:
   - name: mgmt
     ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
       - - "172.16.1.1"
-        - "172.16.1.254"
+        - "172.16.1.50"
     cidr: "172.16.1.0/24"
     role:
       - controller
@@ -57,7 +75,7 @@ ip_settings:
   - name: storage
     ip_ranges:
       - - "172.16.2.1"
-        - "172.16.2.254"
+        - "172.16.2.50"
     cidr: "172.16.2.0/24"
     role:
       - controller
@@ -74,7 +92,7 @@ ip_settings:
       - compute
 
 internal_vip:
-  ip: 172.16.1.222
+  ip: 10.1.0.222
   netmask: "24"
   interface: mgmt
 
@@ -88,7 +106,7 @@ public_net_info:
   enable: "True"
   network: ext-net
   type: flat
-  segment_id: 1000
+  segment_id: 10
   subnet: ext-subnet
   provider_network: physnet
   router: router-ext
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml
index ab485a8d..fe5f8b52 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network.yml
@@ -12,7 +12,7 @@ nic_mappings: []
 bond_mappings: []
 
 provider_net_mappings:
-  - name: br-prv
+  - name: br-provider
     network: physnet
     interface: eth1
     type: ovs
@@ -22,9 +22,15 @@ provider_net_mappings:
 
 sys_intf_mappings:
   - name: mgmt
+    interface: eth0
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
     interface: eth1
     vlan_tag: 101
-    type: vlan
     role:
       - controller
       - compute
@@ -32,14 +38,13 @@ sys_intf_mappings:
   - name: storage
     interface: eth1
     vlan_tag: 102
-    type: vlan
     role:
       - controller
       - compute
 
   - name: external
-    interface: br-prv
-    type: ovs
+    interface: eth1
+    vlan_tag: None
     role:
       - controller
       - compute
@@ -47,8 +52,21 @@ sys_intf_mappings:
 ip_settings:
   - name: mgmt
     ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
       - - "172.16.1.1"
-        - "172.16.1.254"
+        - "172.16.1.50"
     cidr: "172.16.1.0/24"
     role:
       - controller
@@ -57,7 +75,7 @@ ip_settings:
   - name: storage
     ip_ranges:
       - - "172.16.2.1"
-        - "172.16.2.254"
+        - "172.16.2.50"
     cidr: "172.16.2.0/24"
     role:
       - controller
@@ -74,7 +92,7 @@ ip_settings:
       - compute
 
 internal_vip:
-  ip: 172.16.1.222
+  ip: 10.1.0.222
   netmask: "24"
   interface: mgmt
 
@@ -88,7 +106,7 @@ public_net_info:
   enable: "True"
   network: ext-net
   type: flat
-  segment_id: 1000
+  segment_id: 10
   subnet: ext-subnet
   provider_network: physnet
   router: router-ext
diff --git a/deploy/conf/vm_environment/network.yml b/deploy/conf/vm_environment/network.yml
index ab485a8d..fe5f8b52 100644
--- a/deploy/conf/vm_environment/network.yml
+++ b/deploy/conf/vm_environment/network.yml
@@ -12,7 +12,7 @@ nic_mappings: []
 bond_mappings: []
 
 provider_net_mappings:
-  - name: br-prv
+  - name: br-provider
     network: physnet
     interface: eth1
     type: ovs
@@ -22,9 +22,15 @@ provider_net_mappings:
 
 sys_intf_mappings:
   - name: mgmt
+    interface: eth0
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
     interface: eth1
     vlan_tag: 101
-    type: vlan
     role:
       - controller
       - compute
@@ -32,14 +38,13 @@ sys_intf_mappings:
   - name: storage
     interface: eth1
     vlan_tag: 102
-    type: vlan
     role:
       - controller
       - compute
 
   - name: external
-    interface: br-prv
-    type: ovs
+    interface: eth1
+    vlan_tag: None
     role:
       - controller
       - compute
@@ -47,8 +52,21 @@ sys_intf_mappings:
 ip_settings:
   - name: mgmt
     ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
       - - "172.16.1.1"
-        - "172.16.1.254"
+        - "172.16.1.50"
     cidr: "172.16.1.0/24"
     role:
       - controller
@@ -57,7 +75,7 @@ ip_settings:
   - name: storage
     ip_ranges:
       - - "172.16.2.1"
-        - "172.16.2.254"
+        - "172.16.2.50"
     cidr: "172.16.2.0/24"
     role:
       - controller
@@ -74,7 +92,7 @@ ip_settings:
       - compute
 
 internal_vip:
-  ip: 172.16.1.222
+  ip: 10.1.0.222
   netmask: "24"
   interface: mgmt
 
@@ -88,7 +106,7 @@ public_net_info:
   enable: "True"
   network: ext-net
   type: flat
-  segment_id: 1000
+  segment_id: 10
   subnet: ext-subnet
   provider_network: physnet
   router: router-ext