because of replacing the huawei-pod5 with a new pod, 81/25781/1
authorwutianwei <wutianwei1@huawei.com>
Mon, 12 Dec 2016 08:51:51 +0000 (16:51 +0800)
committerwutianwei <wutianwei1@huawei.com>
Mon, 12 Dec 2016 09:02:04 +0000 (17:02 +0800)
we need to change the configuratuion according the new pod.

Change-Id: Ib2bfa54b5fd300fbed5fae77a7f1e6c36fc63b04
Signed-off-by: wutianwei <wutianwei1@huawei.com>
deploy/conf/hardware_environment/huawei-pod5/network.yml
deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml

index 9d3eea1..543fec3 100644 (file)
@@ -13,7 +13,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth1
-    vlan_tag: 125
+    vlan_tag: 3011
     type: vlan
     role:
       - controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
 
   - name: storage
     interface: eth1
-    vlan_tag: 126
+    vlan_tag: 3012
     type: vlan
     role:
       - controller
@@ -55,10 +55,10 @@ ip_settings:
 
   - name: external
     ip_ranges:
-    - - "10.145.140.10"
-      - "10.145.140.50"
-    cidr: "10.145.140.0/24"
-    gw: "10.145.140.1"
+    - - "192.168.5.204"
+      - "192.168.5.210"
+    cidr: "192.168.5.0/24"
+    gw: "192.168.5.1"
     role:
       - controller
       - compute
@@ -69,7 +69,7 @@ internal_vip:
   interface: mgmt
 
 public_vip:
-  ip: 10.145.140.115
+  ip: 192.168.5.211
   netmask: "24"
   interface: external
 
@@ -84,7 +84,7 @@ public_net_info:
   router: router-ext
   enable_dhcp: False
   no_gateway: False
-  external_gw: "10.145.140.1"
-  floating_ip_cidr: "10.145.140.0/24"
-  floating_ip_start: "10.145.140.100"
-  floating_ip_end: "10.145.140.200"
+  external_gw: "192.168.5.1"
+  floating_ip_cidr: "192.168.5.0/24"
+  floating_ip_start: "192.168.5.215"
+  floating_ip_end: "192.168.5.250"
index 8f603de..83c69a2 100644 (file)
@@ -13,7 +13,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth1
-    vlan_tag: 125
+    vlan_tag: 3011
     type: vlan
     role:
       - controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
 
   - name: storage
     interface: eth1
-    vlan_tag: 126
+    vlan_tag: 3012
     type: vlan
     role:
       - controller
@@ -55,10 +55,10 @@ ip_settings:
 
   - name: external
     ip_ranges:
-    - - "10.145.140.10"
-      - "10.145.140.50"
-    cidr: "10.145.140.0/24"
-    gw: "10.145.140.1"
+    - - "192.168.5.204"
+      - "192.168.5.210"
+    cidr: "192.168.5.0/24"
+    gw: "192.168.5.1"
     role:
       - controller
       - compute
@@ -69,7 +69,7 @@ internal_vip:
   interface: mgmt
 
 public_vip:
-  ip: 10.145.140.115
+  ip: 192.168.5.211
   netmask: "24"
   interface: external
 
index 6988020..43b0e67 100644 (file)
@@ -13,7 +13,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth1
-    vlan_tag: 125
+    vlan_tag: 3011
     type: vlan
     role:
       - controller
@@ -21,7 +21,7 @@ sys_intf_mappings:
 
   - name: storage
     interface: eth1
-    vlan_tag: 126
+    vlan_tag: 3012
     type: vlan
     role:
       - controller
@@ -55,10 +55,10 @@ ip_settings:
 
   - name: external
     ip_ranges:
-    - - "10.145.140.10"
-      - "10.145.140.50"
-    cidr: "10.145.140.0/24"
-    gw: "10.145.140.1"
+    - - "192.168.5.204"
+      - "192.168.5.210"
+    cidr: "192.168.5.0/24"
+    gw: "192.168.5.1"
     role:
       - controller
       - compute
@@ -69,7 +69,7 @@ internal_vip:
   interface: mgmt
 
 public_vip:
-  ip: 10.145.140.115
+  ip: 192.168.5.211
   netmask: "24"
   interface: external
 
@@ -84,7 +84,7 @@ public_net_info:
   router: router-ext
   enable_dhcp: False
   no_gateway: False
-  external_gw: "10.145.140.1"
-  floating_ip_cidr: "10.145.140.0/24"
-  floating_ip_start: "10.145.140.100"
-  floating_ip_end: "10.145.140.200"
+  external_gw: "192.168.5.1"
+  floating_ip_cidr: "192.168.5.0/24"
+  floating_ip_start: "192.168.5.215"
+  floating_ip_end: "192.168.5.250"
index 56428da..fc28e1a 100644 (file)
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -20,44 +20,45 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
       - ceph-mon
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
       - ceph-mon
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
+
index 65f3138..9744164 100644 (file)
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -21,41 +21,41 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
index e19937e..513fcb5 100644 (file)
@@ -10,11 +10,11 @@ moon: "Enable"
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -23,11 +23,11 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -35,11 +35,11 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -47,22 +47,23 @@ hosts:
       - ceph-mon
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
+
index 3b01d83..05fb2b2 100644 (file)
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -21,11 +21,11 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -33,11 +33,11 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -45,22 +45,23 @@ hosts:
       - ceph-mon
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
+
index dbc261a..8835b30 100644 (file)
@@ -10,11 +10,11 @@ odl_l3_agent: "Enable"
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -23,11 +23,11 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -35,11 +35,11 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -47,22 +47,23 @@ hosts:
       - ceph-mon
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
+
index cff1bcf..8ea3140 100644 (file)
@@ -8,11 +8,11 @@ ipmiVer: '2.0'
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -21,11 +21,11 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -33,11 +33,11 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -45,22 +45,23 @@ hosts:
       - ceph-mon
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
+
index 435d448..0dc211a 100644 (file)
@@ -10,11 +10,11 @@ onos_sfc: "Enable"
 
 hosts:
   - name: host1
-    mac: '70:7b:e8:75:71:d3'
+    mac: 'E0:97:96:10:67:83'
     interfaces:
-       - eth1: '70:7b:e8:75:71:d2'
-    ipmiIp: 172.31.123.2
-    ipmiPass: root
+       - eth1: 'E0:97:96:10:67:8B'
+    ipmiIp: 192.168.5.173
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -23,11 +23,11 @@ hosts:
       - ceph-mon
 
   - name: host2
-    mac: '70:7b:e8:75:72:21'
+    mac: 'E0:97:96:10:5A:C8'
     interfaces:
-      - eth1: '70:7b:e8:75:72:20'
-    ipmiIp: 172.31.123.3
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5A:D0'
+    ipmiIp: 192.168.5.174
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -35,11 +35,11 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '70:7b:e8:75:71:37'
+    mac: 'E0:97:96:10:67:4D'
     interfaces:
-      - eth1: '70:7b:e8:75:71:36'
-    ipmiIp: 172.31.123.4
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:67:55'
+    ipmiIp: 192.168.5.175
+    ipmiPass: Huawei12#$
     roles:
       - controller
       - ha
@@ -47,21 +47,21 @@ hosts:
       - ceph-mon
 
   - name: host4
-    mac: '70:7b:e8:75:71:dc'
+    mac: 'E0:97:96:10:5D:44'
     interfaces:
-      - eth1: '70:7b:e8:75:71:db'
-    ipmiIp: 172.31.123.5
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:5D:4C'
+    ipmiIp: 192.168.5.176
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd
 
   - name: host5
-    mac: '70:7b:e8:75:71:d6'
+    mac: 'E0:97:96:10:63:29'
     interfaces:
-      - eth1: '70:7b:e8:75:71:d5'
-    ipmiIp: 172.31.123.6
-    ipmiPass: root
+      - eth1: 'E0:97:96:10:63:31'
+    ipmiIp: 192.168.5.177
+    ipmiPass: Huawei12#$
     roles:
       - compute
       - ceph-osd