[compass] deploy ceph on each controller

JIRA: compass-450

Change-Id: I1229d382de579659d009785b59663908b42002e4
Signed-off-by: meimei <meimei@huawei.com>

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 617095a..6e6703c 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
@@ -16,6 +16,8 @@ hosts:
     roles:
       - controller
       - ha
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -26,6 +28,7 @@ hosts:
     roles:
       - controller
       - ha
+      - ceph-mon
 
   - name: host3
     mac: 'D8:49:0B:DA:67:1F'
@@ -36,6 +39,7 @@ hosts:
     roles:
       - controller
       - ha
+      - ceph-mon
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'

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 77c03a9..04fd930 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
@@ -17,6 +17,8 @@ hosts:
       - controller
       - ha
       - opencontrail
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'

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 02fdd03..9dd3257 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
@@ -17,6 +17,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -28,6 +30,7 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     mac: 'D8:49:0B:DA:67:1F'
@@ -39,6 +42,7 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'

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 7f770f5..9b2d058 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
@@ -19,6 +19,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -30,6 +32,7 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     mac: 'D8:49:0B:DA:67:1F'
@@ -41,6 +44,7 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'

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 4a5d688..04e2600 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
@@ -17,6 +17,8 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -28,6 +30,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     mac: 'D8:49:0B:DA:67:1F'
@@ -39,6 +42,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'

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 de40348..dd3ff6e 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
@@ -19,6 +19,8 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'D8:49:0B:DA:5A:B7'
@@ -30,6 +32,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     mac: 'D8:49:0B:DA:67:1F'
@@ -41,6 +44,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     mac: 'D8:49:0B:DA:5B:5D'

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 ccf014e..480777f 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml
@@ -17,6 +17,8 @@ hosts:
       - controller
       - ha
       - opencontrail
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'EC:38:8F:79:0C:48'

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 b5fe559..8d4c584 100644 (file)
--- 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
@@ -17,6 +17,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'EC:38:8F:79:0C:48'
@@ -29,6 +31,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
+
 
   - name: host3
     mac: 'EC:38:8F:79:10:CC'
@@ -41,6 +45,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
+
 
   - name: host4
     mac: 'EC:38:8F:79:0C:6C'

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 59d2bd7..a60cf2a 100644 (file)
--- 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
@@ -19,6 +19,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'EC:38:8F:79:0C:48'
@@ -31,6 +33,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
+
 
   - name: host3
     mac: 'EC:38:8F:79:10:CC'
@@ -43,6 +47,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
+
 
   - name: host4
     mac: 'EC:38:8F:79:0C:6C'

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 f89e5df..90a88f5 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml
@@ -17,6 +17,8 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'EC:38:8F:79:0C:48'
@@ -29,6 +31,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     mac: 'EC:38:8F:79:10:CC'
@@ -41,6 +44,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     mac: 'EC:38:8F:79:0C:6C'

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 59e1274..40bdeff 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml
@@ -19,6 +19,8 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: 'EC:38:8F:79:0C:48'
@@ -31,6 +33,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     mac: 'EC:38:8F:79:10:CC'
@@ -43,6 +46,7 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     mac: 'EC:38:8F:79:0C:6C'

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 e2ee19c..af9ab44 100644 (file)
--- a/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml
@@ -7,18 +7,22 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     roles:

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 cc95ccd..103861a 100644 (file)
--- a/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml
@@ -9,18 +9,22 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     roles:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     roles:

diff --git a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
index fcd07ef..ffcb049 100644 (file)
--- a/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
+++ b/deploy/conf/vm_environment/os-onos-nofeature-ha.yml
@@ -7,18 +7,22 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     roles:

diff --git a/deploy/conf/vm_environment/os-onos-sfc-ha.yml b/deploy/conf/vm_environment/os-onos-sfc-ha.yml
index 7974312..f14339f 100644 (file)
--- a/deploy/conf/vm_environment/os-onos-sfc-ha.yml
+++ b/deploy/conf/vm_environment/os-onos-sfc-ha.yml
@@ -9,18 +9,22 @@ hosts:
       - controller
       - ha
       - onos
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host3
     roles:
       - controller
       - ha
       - onos
+      - ceph-mon
 
   - name: host4
     roles: