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>

6 files changed, 109 insertions, 70 deletions

diff --git a/deploy/conf/base.conf b/deploy/conf/base.conf
index bdbea459..c2bf5291 100644
--- a/deploy/conf/base.conf
+++ b/deploy/conf/base.conf
@@ -3,11 +3,6 @@ export NEUTRON=${NEUTRON:-$COMPASS_DIR/deploy/conf/neutron_cfg.yaml}
 export NETWORK=${NETWORK:-$COMPASS_DIR/deploy/conf/network_cfg.yaml}
 export TAR_URL=${TAR_URL:-file://`pwd`/work/building/compass.tar.gz}
 export INSTALL_IP=${INSTALL_IP:-10.1.0.1}
-export INSTALL_MASK=${INSTALL_MASK:-255.255.255.0}
-export INSTALL_GW=${INSTALL_GW:-10.1.0.1}
-export INSTALL_IP_START=${INSTALL_IP_START:-10.1.0.1}
-export INSTALL_IP_END=${INSTALL_IP_END:-10.1.0.254}
-export MGMT_IP=${MGMT_IP:-10.1.0.1}
 export EXT_NAT_MASK=${EXT_NAT_MASK:-255.255.252.0}
 export EXT_NAT_GW=${EXT_NAT_GW:-192.16.1.1}
 export EXT_NAT_IP_START=${EXT_NAT_IP_START:-192.16.1.3}
@@ -28,34 +23,6 @@ export ENABLE_UBUNTU_THEME=${ENABLE_UBUNTU_THEME:-"true"}
 
 export EXPANSION=${EXPANSION:-"false"}
 
-function next_ip {
-    ip_addr=$1
-    ip_base="$(echo $ip_addr | cut -d. -f'1 2 3')"
-    ip_last="$(echo $ip_addr | cut -d. -f4)"
-    let ip_last_next=$ip_last+1
-    echo "${ip_base}.${ip_last_next}"
-}
-
-if [ -z "$HOST_NETWORKS" ]; then
-    IFS=, read -a HOSTNAME_LIST <<< "$HOSTNAMES"
-    MANAGE_IP=${MANAGEMENT_IP_START}
-    TENANT_IP=${TENANT_IP_START}
-    PUBLIC_IP=${PUBLIC_IP_START}
-    STORAGE_IP=${STORAGE_IP_START}
-    for HOSTNAME in ${HOSTNAME_LIST[@]}; do
-        if [ -z "$HOST_NETWORKS" ]; then
-            HOST_NETWORKS="${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP}|is_mgmt"
-        else
-            HOST_NETWORKS="${HOST_NETWORKS};${HOSTNAME}:${MANAGEMENT_INTERFACE}=${MANAGE_IP}|is_mgmt"
-        fi
-        MANAGE_IP=$(next_ip ${MANAGE_IP})
-        TENANT_IP=$(next_ip ${TENANT_IP})
-        PUBLIC_IP=$(next_ip ${PUBLIC_IP})
-        STORAGE_IP=$(next_ip ${STORAGE_IP})
-    done
-    export HOST_NETWORKS
-fi
-
 export NETWORK_MAPPING=${NETWORK_MAPPING:-"install=${MANAGEMENT_INTERFACE}"}
 
 export PROXY=""
diff --git a/deploy/conf/compass.conf b/deploy/conf/compass.conf
index 4ea087d6..4102fb96 100644
--- a/deploy/conf/compass.conf
+++ b/deploy/conf/compass.conf
@@ -1,8 +1,8 @@
 export COMPASS_VIRT_CPUS=4
 export COMPASS_VIRT_MEM=4096
 export COMPASS_SERVER=$INSTALL_IP
-export COMPASS_SERVER_URL="http://$MGMT_IP:5050/api"
-export HTTP_SERVER_URL="http://$MGMT_IP:5050/api"
+export COMPASS_SERVER_URL="http://$INSTALL_IP:5050/api"
+export HTTP_SERVER_URL="http://$INSTALL_IP:5050/api"
 export COMPASS_USER_EMAIL="admin@huawei.com"
 export COMPASS_USER_PASSWORD="admin"
 export COMPASS_DNS1=${COMPASS_DNS1:-'8.8.8.8'}
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml
index f6deed4b..cba041da 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/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,6 +52,19 @@ sys_intf_mappings:
 ip_settings:
   - name: mgmt
     ip_ranges:
+      - - "10.1.0.100"
+        - "10.1.0.220"
+    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"
     cidr: "172.16.1.0/24"
@@ -74,12 +92,12 @@ ip_settings:
       - compute
 
 internal_vip:
-  ip: 172.16.1.222
+  ip: 10.1.0.222
   netmask: "24"
   interface: mgmt
 
 public_vip:
-  ip: 192.168.10.51
+  ip: 192.16.1.222
   netmask: "24"
   interface: external
 
@@ -88,7 +106,7 @@ public_net_info:
   enable: "True"
   network: ext-net
   type: flat
-  segment_id: 10
+  segment_id: 1000
   subnet: ext-subnet
   provider_network: physnet
   router: router-ext
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