Merge "[intel-pod8] update the configuration"

7 files changed, 71 insertions, 35 deletions

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 b885c22b..f026b4f7 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-nofeature-ha.yml
@@ -13,46 +13,52 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - controller
       - ha
+      - ceph-mon
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - controller
       - ha
+      - ceph-mon
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     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 7892a0b5..b8d93d6b 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-ocl-nofeature-ha.yml
@@ -13,45 +13,51 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
       - opencontrail
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - compute
+      - ceph-osd
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - compute
+      - ceph-osd
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     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 5d46b7ba..62075c05 100644
--- 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
@@ -15,7 +15,7 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
@@ -28,7 +28,7 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - controller
       - ha
@@ -40,7 +40,7 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - controller
       - ha
@@ -52,7 +52,7 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
       - ceph-osd
@@ -62,7 +62,7 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     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 e70169d7..39f946b3 100644
--- 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
@@ -13,49 +13,55 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     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 b7914374..f4fadc94 100644
--- 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
@@ -15,49 +15,55 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     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 5b1390d3..7606691e 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-nofeature-ha.yml
@@ -13,49 +13,55 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     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 0fab6b02..11bfd223 100644
--- a/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/intel-pod8/os-onos-sfc-ha.yml
@@ -15,49 +15,55 @@ hosts:
     interfaces:
       - eth2: '00:1E:67:C5:5B:28'
       - eth3: '00:1E:67:C5:5B:29'
-    ipmiIp: 10.2.117.127
+    ipmiIp: 10.2.117.134
     roles:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
     interfaces:
       - eth2: '00:1E:67:C5:52:24'
       - eth3: '00:1E:67:C5:52:25'
-    ipmiIp: 10.2.117.129
+    ipmiIp: 10.2.117.136
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
     interfaces:
       - eth2: '00:1E:67:C1:FA:E0'
       - eth3: '00:1E:67:C1:FA:E1'
-    ipmiIp: 10.2.117.131
+    ipmiIp: 10.2.117.138
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
     interfaces:
       - eth2: '00:1E:67:E2:58:80'
       - eth3: '00:1E:67:E2:58:81'
-    ipmiIp: 10.2.117.133
+    ipmiIp: 10.2.117.140
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
     interfaces:
       - eth2: '00:1E:67:C1:F9:2C'
       - eth3: '00:1E:67:C1:F9:2D'
-    ipmiIp: 10.2.117.135
+    ipmiIp: 10.2.117.142
     roles:
       - compute
+      - ceph-osd