aboutsummaryrefslogtreecommitdiffstats
path: root/deploy/conf/hardware_environment
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-08-08 07:10:59 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-08 07:10:59 +0000
commit2ca072ae51141431e6b6f2af11ef1646c45f8d2f (patch)
tree366ba1735f0b756328c34a56bbfa9df709daa0d1 /deploy/conf/hardware_environment
parent4b33274421c91659388129c0cfab5989aeb27b0a (diff)
parente78021954ee2cea57fe3db9a21919443f6e0bf70 (diff)
Merge "[bugfix] miss osd in ceph deployment"
Diffstat (limited to 'deploy/conf/hardware_environment')
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml2
11 files changed, 26 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