[moon-ceph] deploy ceph on moon scenario

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

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 fee261c..16739a8 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
@@ -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-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
index bf1bfc6..d62cdcd 100644 (file)
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-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/intel-pod8/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-odl_l2-moon-ha.yml
index 1582aad..5d46b7b 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
@@ -20,6 +20,8 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-adm
+      - ceph-mon
 
   - name: host2
     mac: '00:1E:67:D4:39:B5'
@@ -31,6 +33,7 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host3
     mac: '00:1E:67:D4:31:B2'
@@ -42,6 +45,7 @@ hosts:
       - controller
       - ha
       - odl
+      - ceph-mon
 
   - name: host4
     mac: '00:1E:67:D4:34:67'
@@ -51,6 +55,7 @@ hosts:
     ipmiIp: 10.2.117.133
     roles:
       - compute
+      - ceph-osd
 
   - name: host5
     mac: '00:1E:67:D4:38:42'
@@ -60,4 +65,5 @@ hosts:
     ipmiIp: 10.2.117.135
     roles:
       - compute
+      - ceph-osd
 

diff --git a/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
index e689875..6b5a1f6 100644 (file)
--- a/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
@@ -9,23 +9,29 @@ 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:
       - compute
+      - ceph-osd
 
   - name: host5
     roles:
       - compute
+      - ceph-osd