update zte-pod2 configuration files

Due to zte-pod2 migration, update zte-pod2 configuration
files.

JIRA: PHAROS-245

Change-Id: I3b077fe379556c237541f058b6c8307ec549ddca
Signed-off-by: wu.zhihui <wu.zhihui1@zte.com.cn>

2 files changed, 68 insertions, 61 deletions

diff --git a/labs/zte/pod2/fuel/config/dea-pod-override.yaml b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
index ab6aee9..fdacd1d 100644
--- a/labs/zte/pod2/fuel/config/dea-pod-override.yaml
+++ b/labs/zte/pod2/fuel/config/dea-pod-override.yaml
@@ -16,26 +16,28 @@ environment:
   name: opnfv-zte
 fuel:
   ADMIN_NETWORK:
-    dhcp_pool_end: 10.20.1.254
-    dhcp_pool_start: 10.20.1.3
-    ipaddress: 10.20.1.2
+    dhcp_pool_end: 10.20.7.200
+    dhcp_pool_start: 10.20.7.10
+    ipaddress: 10.20.7.2
     netmask: 255.255.255.0
   DNS_DOMAIN: domain.tld
   DNS_SEARCH: domain.tld
   DNS_UPSTREAM: 114.114.114.114
   HOSTNAME: fuel
-  NTP1: 10.20.0.1
+  NTP1: 172.70.0.1
   NTP2:
   NTP3:
 interfaces_1:
-  enp129s0f0:
+  ens4f0:
   - fuelweb_admin
+  ens12f0:
   - management
-  enp2s0f0:
+  ens12f1:
+  - storage
+  ens44f0:
   - private
+  ens44f1:
   - public
-  enp132s0f0:
-  - storage
 transformations_1:
   transformations:
   - action: add-br
@@ -58,35 +60,35 @@ transformations_1:
   - action: add-br
     name: br-mesh
   - action: add-port
-    bridge: br-fw-admin
-    name: enp129s0f0
-  - action: add-port
     bridge: br-mgmt
-    name: enp129s0f0.501
+    name: ens12f0.171
   - action: add-port
     bridge: br-storage
-    name: enp132s0f0.502
+    name: ens12f1.172
+  - action: add-port
+    bridge: br-mesh
+    name: ens44f0.1170
   - action: add-port
     bridge: br-ex
-    name: enp2s0f0
+    name: ens44f1.173
   - action: add-port
-    bridge: br-mesh
-    name: enp2s0f0.503
+    bridge: br-fw-admin
+    name: ens4f0
 network:
   networking_parameters:
-    base_mac: fa:16:3e:00:00:00
+    base_mac: fa:16:7e:00:00:00
     configuration_template: null
     dns_nameservers:
-    - 114.114.114.114
+    - 172.70.0.1
     floating_name: admin_floating_net
     floating_ranges:
-    - - 172.30.0.130
-      - 172.30.0.254
+    - - 172.70.0.130
+      - 172.30.0.230
     gre_id_range:
     - 2
     - 65535
-    internal_cidr: 192.168.111.0/24
-    internal_gateway: 192.168.111.1
+    internal_cidr: 192.168.117.0/24
+    internal_gateway: 192.168.117.1
     internal_name: admin_internal_net
     net_l23_provider: ovs
     segmentation_type: tun
@@ -94,18 +96,18 @@ network:
     - 1000
     - 1030
   networks:
-  - cidr: 172.30.0.0/24
-    gateway: 172.30.0.1
+  - cidr: 172.70.0.0/24
+    gateway: 172.70.0.1
     ip_ranges:
-    - - 172.30.0.2
-      - 172.30.0.126
+    - - 172.70.0.10
+      - 172.70.0.126
     meta:
-      cidr: 172.30.0.0/24
+      cidr: 172.16.0.0/24
       configurable: true
       floating_range_var: floating_ranges
       ip_range:
-      - 172.30.0.2
-      - 172.30.0.126
+      - 172.16.0.2
+      - 172.16.0.126
       map_priority: 1
       name: public
       notation: ip_ranges
@@ -117,12 +119,14 @@ network:
       - vrouter
       vlan_start: null
     name: public
-    vlan_start: null
-  - cidr: 192.168.31.0/24
+    vlan_start: 173
+  - cidr: 192.168.72.0/24
     gateway: null
+    group_id: 3
+    id: 12
     ip_ranges:
-    - - 192.168.31.1
-      - 192.168.31.254
+    - - 192.168.72.1
+      - 192.168.72.254
     meta:
       cidr: 192.168.1.0/24
       configurable: true
@@ -134,12 +138,14 @@ network:
       use_gateway: false
       vlan_start: 102
     name: storage
-    vlan_start: 502
-  - cidr: 192.168.30.0/24
+    vlan_start: 172
+  - cidr: 192.168.71.0/24
     gateway: null
+    group_id: 3
+    id: 11
     ip_ranges:
-    - - 192.168.30.1
-      - 192.168.30.254
+    - - 192.168.71.1
+      - 192.168.71.254
     meta:
       cidr: 192.168.0.0/24
       configurable: true
@@ -154,12 +160,12 @@ network:
       - vrouter
       vlan_start: 101
     name: management
-    vlan_start: 501
-  - cidr: 192.168.32.0/24
+    vlan_start: 171
+  - cidr: 192.168.73.0/24
     gateway: null
     ip_ranges:
-    - - 192.168.32.1
-      - 192.168.32.254
+    - - 192.168.73.1
+      - 192.168.73.254
     meta:
       cidr: 192.168.2.0/24
       configurable: true
@@ -172,12 +178,14 @@ network:
       use_gateway: false
       vlan_start: 103
     name: private
-    vlan_start: 503
-  - cidr: 10.20.1.0/24
-    gateway: 10.20.1.2
+    vlan_start: 1170
+  - cidr: 10.20.7.0/24
+    gateway: 10.20.7.2
+    group_id: null
+    id: 1
     ip_ranges:
-    - - 10.20.1.3
-      - 10.20.1.254
+    - - 10.20.7.10
+      - 10.20.7.200
     meta:
       configurable: false
       map_priority: 0
@@ -188,8 +196,8 @@ network:
       use_gateway: true
     name: fuelweb_admin
     vlan_start: null
-  public_vip: 172.20.0.2
-  public_vrouter_vip: 172.20.0.3
+  public_vip: 172.70.0.11
+  public_vrouter_vip: 172.70.0.10
 settings:
   editable:
     external_dns:
@@ -200,7 +208,7 @@ settings:
           error: Invalid IP address list
           source: ^\*$|^(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3}(?:\s*,\s*(?:\d|1?\d\d|2[0-4]\d|25[0-5])(?:\.(?:\d|1?\d\d|2[0-4]\d|25[0-5])){3})*$
         type: text
-        value: 114.114.114.114
+        value: 172.70.0.1
         weight: 10
       metadata:
         group: network
@@ -218,7 +226,7 @@ settings:
           error: Invalid NTP server list
           source: ^\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(?:\.\d{1,3}){3})\s*(?:,\s*(?:(?:\w+(?:-+\w+)*\.)+[a-z]+|\d{1,3}(\.\d{1,3}){3})\s*)*$
         type: text
-        value: 10.20.0.1
+        value: 172.70.0.1
         weight: 10
     syslog:
       metadata:
diff --git a/labs/zte/pod2/fuel/config/dha.yaml b/labs/zte/pod2/fuel/config/dha.yaml
index 69001ad..98ee6a0 100644
--- a/labs/zte/pod2/fuel/config/dha.yaml
+++ b/labs/zte/pod2/fuel/config/dha.yaml
@@ -12,28 +12,28 @@ adapter: zte
 
 nodes:
 - id: 1
-  pxeMac: 3c:da:2a:e8:01:ed
-  ipmiIp: 129.5.1.9
+  pxeMac: 74:4A:A4:00:CD:72
+  ipmiIp: 192.168.1.106
   ipmiUser: zteroot
   ipmiPass: superuser
 - id: 2
-  pxeMac: 3c:da:2a:e8:02:4c
-  ipmiIp: 129.5.1.10
+  pxeMac: 74:4A:A4:00:CA:CC
+  ipmiIp: 192.168.1.107
   ipmiUser: zteroot
   ipmiPass: superuser
 - id: 3
-  pxeMac: 3c:da:2a:e8:01:a7 
-  ipmiIp: 129.5.1.11
+  pxeMac: 74:4A:A4:00:CD:12
+  ipmiIp: 192.168.1.108
   ipmiUser: zteroot
   ipmiPass: superuser
 - id: 4
-  pxeMac: 3c:da:2a:e8:01:ca 
-  ipmiIp: 129.5.1.12
+  pxeMac: 74:4A:A4:00:CF:40
+  ipmiIp: 192.168.1.109
   ipmiUser: zteroot
   ipmiPass: superuser
 - id: 5
-  pxeMac: 3c:da:2a:e8:01:b6 
-  ipmiIp: 129.5.1.13
+  pxeMac: 74:4A:A4:00:CE:D4
+  ipmiIp: 192.168.1.110
   ipmiUser: zteroot
   ipmiPass: superuser
 
@@ -49,4 +49,3 @@ nodes:
 
 disks:
   fuel: 100G
-