summaryrefslogtreecommitdiffstats
path: root/deploy/conf
diff options
context:
space:
mode:
Diffstat (limited to 'deploy/conf')
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-nofeature-ha.yml8
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-ocl-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l2-nofeature-ha.yml8
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-odl_l3-nofeature-ha.yml8
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-nofeature-ha.yml8
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-onos-sfc-ha.yml8
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-ocl-nofeature-ha.yml2
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l3-nofeature-ha.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-nofeature-ha.yml4
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-onos-sfc-ha.yml4
-rw-r--r--deploy/conf/vm_environment/os-odl_l2-moon-ha.yml31
-rw-r--r--deploy/conf/vm_environment/os-odl_l2-nofeature-ha.yml4
-rw-r--r--deploy/conf/vm_environment/os-odl_l3-nofeature-ha.yml4
-rw-r--r--deploy/conf/vm_environment/os-onos-nofeature-ha.yml4
-rw-r--r--deploy/conf/vm_environment/os-onos-sfc-ha.yml4
16 files changed, 103 insertions, 12 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 64d6793d..6e6703cb 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
@@ -16,6 +16,8 @@ hosts:
roles:
- controller
- ha
+ - ceph-adm
+ - ceph-mon
- name: host2
mac: 'D8:49:0B:DA:5A:B7'
@@ -26,16 +28,18 @@ hosts:
roles:
- controller
- ha
+ - ceph-mon
- name: host3
- mac: 'D8:49:0B:DA:2A:28'
+ mac: 'D8:49:0B:DA:67:1F'
interfaces:
- - eth1: 'D8:49:0B:DA:2A:29'
+ - eth1: 'D8:49:0B:DA:67:20'
ipmiIp: 172.16.130.29
ipmiPass: Huawei@123
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 0492efdb..04fd9308 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
@@ -17,6 +17,8 @@ hosts:
- controller
- ha
- opencontrail
+ - ceph-adm
+ - ceph-mon
- name: host2
mac: 'D8:49:0B:DA:5A:B7'
@@ -28,9 +30,9 @@ hosts:
- compute
- name: host3
- mac: 'D8:49:0B:DA:2A:28'
+ mac: 'D8:49:0B:DA:67:1F'
interfaces:
- - eth1: 'D8:49:0B:DA:2A:29'
+ - eth1: 'D8:49:0B:DA:67:20'
ipmiIp: 172.16.130.29
ipmiPass: Huawei@123
roles:
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 ce10bab9..9dd32576 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
@@ -17,6 +17,8 @@ hosts:
- controller
- ha
- odl
+ - ceph-adm
+ - ceph-mon
- name: host2
mac: 'D8:49:0B:DA:5A:B7'
@@ -28,17 +30,19 @@ hosts:
- controller
- ha
- odl
+ - ceph-mon
- name: host3
- mac: 'D8:49:0B:DA:2A:28'
+ mac: 'D8:49:0B:DA:67:1F'
interfaces:
- - eth1: 'D8:49:0B:DA:2A:29'
+ - eth1: 'D8:49:0B:DA:67:20'
ipmiIp: 172.16.130.29
ipmiPass: Huawei@123
roles:
- 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 563f6405..9b2d0581 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
@@ -19,6 +19,8 @@ hosts:
- controller
- ha
- odl
+ - ceph-adm
+ - ceph-mon
- name: host2
mac: 'D8:49:0B:DA:5A:B7'
@@ -30,17 +32,19 @@ hosts:
- controller
- ha
- odl
+ - ceph-mon
- name: host3
- mac: 'D8:49:0B:DA:2A:28'
+ mac: 'D8:49:0B:DA:67:1F'
interfaces:
- - eth1: 'D8:49:0B:DA:2A:29'
+ - eth1: 'D8:49:0B:DA:67:20'
ipmiIp: 172.16.130.29
ipmiPass: Huawei@123
roles:
- 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 9b05aded..04e26003 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
@@ -17,6 +17,8 @@ hosts:
- controller
- ha
- onos
+ - ceph-adm
+ - ceph-mon
- name: host2
mac: 'D8:49:0B:DA:5A:B7'
@@ -28,17 +30,19 @@ hosts:
- controller
- ha
- onos
+ - ceph-mon
- name: host3
- mac: 'D8:49:0B:DA:2A:28'
+ mac: 'D8:49:0B:DA:67:1F'
interfaces:
- - eth1: 'D8:49:0B:DA:2A:29'
+ - eth1: 'D8:49:0B:DA:67:20'
ipmiIp: 172.16.130.29
ipmiPass: Huawei@123
roles:
- 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 5b1206b4..dd3ff6e2 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
@@ -19,6 +19,8 @@ hosts:
- controller
- ha
- onos
+ - ceph-adm
+ - ceph-mon
- name: host2
mac: 'D8:49:0B:DA:5A:B7'
@@ -30,17 +32,19 @@ hosts:
- controller
- ha
- onos
+ - ceph-mon
- name: host3
- mac: 'D8:49:0B:DA:2A:28'
+ mac: 'D8:49:0B:DA:67:1F'
interfaces:
- - eth1: 'D8:49:0B:DA:2A:29'
+ - eth1: 'D8:49:0B:DA:67:20'
ipmiIp: 172.16.130.29
ipmiPass: Huawei@123
roles:
- 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 ccf014e5..480777f0 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
@@ -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 b5fe5590..8d4c5843 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
@@ -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 59d2bd76..a60cf2ab 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
@@ -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 f89e5df2..90a88f59 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
@@ -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 59e12745..40bdeffd 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
@@ -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-moon-ha.yml b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
new file mode 100644
index 00000000..e689875b
--- /dev/null
+++ b/deploy/conf/vm_environment/os-odl_l2-moon-ha.yml
@@ -0,0 +1,31 @@
+TYPE: virtual
+FLAVOR: cluster
+
+moon: "Enable"
+
+hosts:
+ - name: host1
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host2
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host3
+ roles:
+ - controller
+ - ha
+ - odl
+
+ - name: host4
+ roles:
+ - compute
+
+ - name: host5
+ roles:
+ - compute
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 e2ee19c6..af9ab441 100644
--- 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 cc95ccd5..103861a8 100644
--- 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 fcd07efc..ffcb0499 100644
--- 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 7974312f..f14339f9 100644
--- 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: