Code Review / compass4nfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 2e33f30)
update intel pod8 configuration 99/26899/7
authormeimei <meimei@huawei.com>
Thu, 12 Jan 2017 02:13:46 +0000 (10:13 +0800)
committerJustin chi <chigang@huawei.com>
Sat, 14 Jan 2017 08:18:19 +0000 (08:18 +0000)
the IPMI IP assignment and vlan of intel-pod8 have been changed

Change-Id: Ia6f2880ab2388b031b79046c00e03bc918b957e1
Signed-off-by: meimei <meimei@huawei.com>
deploy/conf/hardware_environment/intel-pod8/network.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/network_ocl.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/network_onos.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml patch | blob | history

diff --git a/deploy/conf/hardware_environment/intel-pod8/network.yml b/deploy/conf/hardware_environment/intel-pod8/network.yml
index 7f00bc3..85e379d 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/network.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network.yml
@@ -14,7 +14,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: 854
+    vlan_tag: 805
     type: vlan
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
index 7f00bc3..85e379d 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network_ocl.yml
@@ -14,7 +14,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: 854
+    vlan_tag: 805
     type: vlan
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
index e1d099a..5437a74 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/network_onos.yml
@@ -5,7 +5,7 @@ bond_mappings: []
 provider_net_mappings:
   - name: br-prv
     network: physnet
-    interface: eth2
+    interface: eth1
     type: ovs
     role:
       - controller
@@ -14,7 +14,7 @@ provider_net_mappings:
 sys_intf_mappings:
   - name: mgmt
     interface: eth3
-    vlan_tag: 854
+    vlan_tag: 805
     type: vlan
     role:
       - controller
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
index 1d1fd52..b144603 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
@@ -14,7 +14,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -27,7 +27,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -39,7 +39,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - controller
       - ha
@@ -51,7 +51,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -62,7 +62,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
index 026e40a..1beee7f 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
@@ -15,7 +15,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -29,7 +29,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - compute
       - ceph-osd
@@ -40,7 +40,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - compute
       - ceph-osd
@@ -51,7 +51,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -62,7 +62,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
index c065f5c..431d853 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
@@ -16,7 +16,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -30,7 +30,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -43,7 +43,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - controller
       - ha
@@ -56,7 +56,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -67,7 +67,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
index 13e7fd0..bf845d7 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-nofeature-ha.yml
@@ -14,7 +14,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -28,7 +28,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -41,7 +41,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - controller
       - ha
@@ -54,7 +54,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -65,7 +65,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
index 04fba03..23460ff 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-odl_l3-nofeature-ha.yml
@@ -16,7 +16,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -30,7 +30,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -43,7 +43,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - controller
       - ha
@@ -56,7 +56,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -67,7 +67,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
index 57a790e..d7fa89f 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
@@ -14,7 +14,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -28,7 +28,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -41,7 +41,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - controller
       - ha
@@ -54,7 +54,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -65,7 +65,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
index 1edd027..fdafc3b 100644 (file)
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
@@ -16,7 +16,7 @@ hosts:
       - eth1: '00:1E:67:D4:30:D1'
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.134
+    ipmiIp: 10.2.117.133
     roles:
       - controller
       - ha
@@ -30,7 +30,7 @@ hosts:
       - eth1: '00:1E:67:D4:39:B4'
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.136
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -43,7 +43,7 @@ hosts:
       - eth1: '00:1E:67:D4:31:B1'
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.138
+    ipmiIp: 10.2.117.135
     roles:
       - controller
       - ha
@@ -56,7 +56,7 @@ hosts:
       - eth1: '00:1E:67:D4:34:66'
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.140
+    ipmiIp: 10.2.117.136
     roles:
       - compute
       - ceph-osd
@@ -67,7 +67,7 @@ hosts:
       - eth1: '00:1E:67:D4:38:41'
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.142
+    ipmiIp: 10.2.117.137
     roles:
       - compute
       - ceph-osd