From f70d3aa8ffe7878e86b8f12c91c99018924a74b3 Mon Sep 17 00:00:00 2001
From: wutianwei <wutianwei1@huawei.com>
Date: Thu, 28 Sep 2017 11:25:49 +0800
Subject: Modify the network and DHA files

Due to pod2 virtual3 and virtual4 run danube before,
we need to change the network and DHA to run euphrates

Change-Id: I720138cb960cc6f3a57bf5f777c0debb80f64eba
Signed-off-by: wutianwei <wutianwei1@huawei.com>
---
 .../hardware_environment/huawei-pod2/network.yml   | 56 ++++++++++++++++------
 1 file changed, 41 insertions(+), 15 deletions(-)

(limited to 'deploy/conf/hardware_environment/huawei-pod2/network.yml')

diff --git a/deploy/conf/hardware_environment/huawei-pod2/network.yml b/deploy/conf/hardware_environment/huawei-pod2/network.yml
index 7ea69819..ccf66a47 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network.yml
@@ -12,43 +12,64 @@ nic_mappings: []
 bond_mappings: []
 
 provider_net_mappings:
-  - name: br-prv
+  - name: br-provider
     network: physnet
-    interface: eth1
+    interface: eth10
     type: ovs
     role:
       - controller
-      - compute
 
 sys_intf_mappings:
   - name: mgmt
+    interface: eth0
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
     interface: eth1
+    type: normal
     vlan_tag: 101
-    type: vlan
     role:
       - controller
       - compute
 
   - name: storage
     interface: eth1
+    type: normal
     vlan_tag: 102
-    type: vlan
     role:
       - controller
       - compute
 
   - name: external
-    interface: br-prv
-    type: ovs
+    interface: eth1
+    type: normal
+    vlan_tag: None
     role:
       - controller
       - compute
 
 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 +78,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
@@ -66,7 +87,7 @@ ip_settings:
   - name: external
     ip_ranges:
       - - "192.168.11.10"
-        - "192.168.11.15"
+        - "192.168.11.50"
     cidr: "192.168.11.0/24"
     gw: "192.168.11.1"
     role:
@@ -74,21 +95,26 @@ ip_settings:
       - compute
 
 internal_vip:
-  ip: 172.16.1.222
+  ip: 10.1.0.222
   netmask: "24"
   interface: mgmt
 
 public_vip:
-  ip: 192.168.11.18
+  ip: 192.168.11.222
   netmask: "24"
   interface: external
 
 onos_nic: eth2
+tenant_net_info:
+  type: vxlan
+  range: "1:1000"
+  provider_network: None
+
 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
@@ -96,5 +122,5 @@ public_net_info:
   no_gateway: "False"
   external_gw: "192.168.11.1"
   floating_ip_cidr: "192.168.11.0/24"
-  floating_ip_start: "192.168.11.30"
-  floating_ip_end: "192.168.11.100"
+  floating_ip_start: "192.168.11.100"
+  floating_ip_end: "192.168.11.200"
-- 
cgit 1.2.3-korg