Merge "[bugfix] miss osd in ceph deployment"

15 files changed, 34 insertions, 0 deletions

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 6e6703cb..b13b76f9 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml
@@ -49,6 +49,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -58,4 +59,5 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
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 04fd9308..9eb4adae 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml
@@ -28,6 +28,7 @@ hosts:
     ipmiPass: huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host3
     mac: 'D8:49:0B:DA:67:1F'
@@ -37,6 +38,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'
@@ -46,6 +48,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -55,4 +58,5 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
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 9dd32576..98b24a1e 100644
--- 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
@@ -52,6 +52,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -61,4 +62,5 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
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 9b2d0581..2c578faa 100644
--- 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
@@ -54,6 +54,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -63,4 +64,5 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
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 04e26003..aec1ff09 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml
@@ -52,6 +52,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -61,4 +62,5 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
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 dd3ff6e2..98ae5eba 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml
@@ -54,6 +54,7 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'D8:49:0B:DA:56:85'
@@ -63,4 +64,5 @@ hosts:
     ipmiPass: Huawei@123
     roles:
       - compute
+      - ceph-osd
 
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
index 480777f0..49df9ddc 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
@@ -29,6 +29,7 @@ hosts:
       - eth1: 'EC:38:8F:79:0C:49'
     roles:
       - compute
+      - ceph-osd
 
   - name: host3
     mac: 'EC:38:8F:79:10:CC'
@@ -39,6 +40,7 @@ hosts:
       - eth1: 'EC:38:8F:79:10:CD'
     roles:
       - compute
+      - ceph-osd
 
   - name: host4
     mac: 'EC:38:8F:79:0C:6C'
@@ -49,6 +51,7 @@ hosts:
       - eth1: 'EC:38:8F:79:0C:6D'
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'EC:38:8F:7A:E6:ED'
@@ -59,3 +62,4 @@ hosts:
       - eth1: 'EC:38:8F:7A:E6:EE'
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml
index 8d4c5843..4a1e2e9f 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml
@@ -57,6 +57,7 @@ hosts:
       - eth1: 'EC:38:8F:79:0C:6D'
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'EC:38:8F:7A:E6:ED'
@@ -67,3 +68,4 @@ hosts:
       - eth1: 'EC:38:8F:7A:E6:EE'
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml
index a60cf2ab..96f42273 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml
@@ -59,6 +59,7 @@ hosts:
       - eth1: 'EC:38:8F:79:0C:6D'
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'EC:38:8F:7A:E6:ED'
@@ -69,3 +70,4 @@ hosts:
       - eth1: 'EC:38:8F:7A:E6:EE'
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
index 90a88f59..85aff3d7 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
@@ -55,6 +55,7 @@ hosts:
       - eth1: 'EC:38:8F:79:0C:6D'
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'EC:38:8F:7A:E6:ED'
@@ -65,3 +66,4 @@ hosts:
       - eth1: 'EC:38:8F:7A:E6:EE'
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
index 40bdeffd..4b53c1df 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
@@ -57,6 +57,7 @@ hosts:
       - eth1: 'EC:38:8F:79:0C:6D'
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: 'EC:38:8F:7A:E6:ED'
@@ -67,3 +68,4 @@ hosts:
       - eth1: 'EC:38:8F:7A:E6:EE'
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
index af9ab441..df84a741 100644
--- a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
@@ -27,7 +27,9 @@ hosts:
   - name: host4
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
index 103861a8..aff6bcb7 100644
--- a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
@@ -29,7 +29,9 @@ hosts:
   - name: host4
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
index ffcb0499..82797ef8 100644
--- a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
@@ -27,7 +27,9 @@ hosts:
   - name: host4
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     roles:
       - compute
+      - ceph-osd
diff --git a/deploy/conf/vm_environment/os-onos-sfc-ha.yml b/deploy/conf/vm_environment/os-onos-sfc-ha.yml
index f14339f9..402b3924 100644
--- a/deploy/conf/vm_environment/os-onos-sfc-ha.yml
+++ b/deploy/conf/vm_environment/os-onos-sfc-ha.yml
@@ -29,7 +29,9 @@ hosts:
   - name: host4
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     roles:
       - compute
+      - ceph-osd