Code Review / compass4nfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: 96a80be)
Modify Huawei-pod1 host info 65/65965/2
authorHarry Huang <huangxiangyu5@huawei.com>
Wed, 19 Dec 2018 06:48:07 +0000 (14:48 +0800)
committerwutianwei <wutianwei1@huawei.com>
Thu, 20 Dec 2018 06:35:32 +0000 (06:35 +0000)
JIRA: -

Change-Id: I9d03cf4548db53a760fa297ed824d9bfed33ad8f
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
14 files changed:
deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-stor4nfv-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-nosdn-stor4nfv-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml patch | blob | history
deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml patch | blob | history

diff --git a/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml
index 2cedcf4..29ca9ac 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-nofeature-ha.yml
@@ -31,7 +31,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - kube_master
@@ -39,10 +39,10 @@ hosts:
       - ha
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - kube_master
diff --git a/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-stor4nfv-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-stor4nfv-ha.yml
index 6cf62db..6efdadc 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-stor4nfv-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/k8-nosdn-stor4nfv-ha.yml
@@ -34,7 +34,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - kube_master
@@ -42,10 +42,10 @@ hosts:
       - ha
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - kube_master
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml
index 59e7180..32f561d 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-bar-ha.yml
@@ -35,7 +35,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -43,10 +43,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml
index 9c00916..03267ff 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-kvm-ha.yml
@@ -35,7 +35,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -43,10 +43,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
index 6b329be..7ca9e79 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
@@ -32,7 +32,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -40,10 +40,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
index 6027bdd..b2440ee 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
@@ -40,7 +40,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -48,10 +48,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-stor4nfv-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-stor4nfv-ha.yml
index 5045975..5ce9b47 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-stor4nfv-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-stor4nfv-ha.yml
@@ -35,7 +35,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -43,10 +43,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
index 287383b..bfab015 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
@@ -33,17 +33,17 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - compute
       - ceph-osd
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - compute
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml
index 8095fe0..c5fd84e 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl-sfc-ha.yml
@@ -38,7 +38,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -47,10 +47,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
index d2447c1..71b114f 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-moon-ha.yml
@@ -37,7 +37,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -46,10 +46,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml
index 71edf08..2c2757a 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml
@@ -36,7 +36,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -45,10 +45,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml
index e3e71d0..cc621d7 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml
@@ -38,7 +38,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -47,10 +47,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
index fb4b178..57d0a2d 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
@@ -33,7 +33,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -42,10 +42,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
index 1f40241..c8aee2d 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
@@ -35,7 +35,7 @@ hosts:
     mac: 'D8:49:0B:DA:5A:B7'
     interfaces:
       - eth1: 'D8:49:0B:DA:5A:B8'
-    ipmiIp: 172.16.130.27
+    ipmiIp: 172.16.130.29
     ipmiPass: Opnfv@pod1
     roles:
       - controller
@@ -44,10 +44,10 @@ hosts:
       - ceph-mon
 
   - name: host3
-    mac: '78:D7:52:A0:B1:99'
+    mac: '70:7B:E8:77:7B:60'
     interfaces:
-      - eth1: '78:D7:52:A0:B1:9A'
-    ipmiIp: 172.16.130.29
+      - eth1: '70:7B:E8:77:7B:5F'
+    ipmiIp: 172.16.130.27
     ipmiPass: Opnfv@pod1
     roles:
       - controller