summaryrefslogtreecommitdiffstats
path: root/deploy
diff options
context:
space:
mode:
authorJustin chi <chigang@huawei.com>2017-03-08 04:42:27 +0000
committerGerrit Code Review <gerrit@opnfv.org>2017-03-08 04:42:27 +0000
commit3a90b69c278bf4f822d182ce7f1c995f32760173 (patch)
tree5467f0329a60dd2ddedf528b20e1bc7fe10f884a /deploy
parent2a076c37c20ccce7947d31c7799547cebae90ab2 (diff)
parent0351663ac49a41706954115d2919729ffc5272c7 (diff)
Merge "add open-o scenario"
Diffstat (limited to 'deploy')
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network_openo.yml114
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml75
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_openo.yml114
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml80
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/network_openo.yml114
-rw-r--r--deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml81
-rw-r--r--deploy/conf/vm_environment/os-nosdn-openo-ha.yml (renamed from deploy/conf/vm_environment/os-nosdn-openo-noha.yml)1
7 files changed, 579 insertions, 0 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml b/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml
new file mode 100644
index 00000000..80b80fc6
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod1/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+ - name: br-prv
+ network: physnet
+ interface: eth1
+ type: ovs
+ role:
+ - controller
+ - compute
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth1
+ vlan_tag: 101
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ vlan_tag: 102
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: external
+ interface: br-prv
+ type: ovs
+ role:
+ - controller
+ - compute
+
+ip_settings:
+ - name: mgmt
+ ip_ranges:
+ - - "172.16.1.1"
+ - "172.16.1.254"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.254"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.168.10.10"
+ - "192.168.10.50"
+ cidr: "192.168.10.0/24"
+ gw: "192.168.10.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.10.51
+ netmask: "24"
+ interface: external
+
+onos_nic: eth2
+public_net_info:
+ enable: "True"
+ network: ext-net
+ type: flat
+ segment_id: 10
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "192.168.10.1"
+ floating_ip_cidr: "192.168.10.0/24"
+ floating_ip_start: "192.168.10.100"
+ floating_ip_end: "192.168.10.200"
+
+openo_net:
+ openo_vm_ip: "192.168.10.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "192.168.10.1"
+ openo_external_cidr: "192.168.10.0/24"
+
+openo_docker_net:
+ docker_ip_start: "192.168.10.51"
+ docker_ip_end: "192.168.10.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
new file mode 100644
index 00000000..6eb50a29
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-openo-ha.yml
@@ -0,0 +1,75 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+deploy_options:
+ - orchestrator: open-o
+ - application: clearwater
+
+hosts:
+ - name: host1
+ mac: 'F8:4A:BF:55:A2:8D'
+ interfaces:
+ - eth1: 'F8:4A:BF:55:A2:8E'
+ ipmiIp: 172.16.130.26
+ ipmiPass: Huawei@123
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: 'D8:49:0B:DA:5A:B7'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:5A:B8'
+ ipmiIp: 172.16.130.27
+ ipmiPass: huawei@123
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: '78:D7:52:A0:B1:99'
+ interfaces:
+ - eth1: '78:D7:52:A0:B1:9A'
+ ipmiIp: 172.16.130.29
+ ipmiPass: Huawei@123
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: 'D8:49:0B:DA:5B:5D'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:5B:5E'
+ ipmiIp: 172.16.130.30
+ ipmiPass: Huawei@123
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: 'D8:49:0B:DA:56:85'
+ interfaces:
+ - eth1: 'D8:49:0B:DA:56:86'
+ ipmiIp: 172.16.130.31
+ ipmiPass: Huawei@123
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml b/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml
new file mode 100644
index 00000000..7f2d45d3
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+ - name: br-prv
+ network: physnet
+ interface: eth1
+ type: ovs
+ role:
+ - controller
+ - compute
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth1
+ vlan_tag: 101
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ vlan_tag: 102
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: external
+ interface: br-prv
+ type: ovs
+ role:
+ - controller
+ - compute
+
+ip_settings:
+ - name: mgmt
+ ip_ranges:
+ - - "172.16.1.1"
+ - "172.16.1.254"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.254"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.168.11.10"
+ - "192.168.11.15"
+ cidr: "192.168.11.0/24"
+ gw: "192.168.11.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.11.18
+ netmask: "24"
+ interface: external
+
+onos_nic: eth2
+public_net_info:
+ enable: "True"
+ network: ext-net
+ type: flat
+ segment_id: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "192.168.11.1"
+ floating_ip_cidr: "192.168.11.0/24"
+ floating_ip_start: "192.168.11.30"
+ floating_ip_end: "192.168.11.100"
+
+openo_net:
+ openo_vm_ip: "192.168.11.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "192.168.11.1"
+ openo_external_cidr: "192.168.11.0/24"
+
+openo_docker_net:
+ docker_ip_start: "192.168.11.51"
+ docker_ip_end: "192.168.11.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml
new file mode 100644
index 00000000..e1219ddc
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-openo-ha.yml
@@ -0,0 +1,80 @@
+##############################################################################
+# Copyright (c) 2016 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiVer: '2.0'
+
+deploy_options:
+ - orchestrator: open-o
+ - application: clearwater
+
+hosts:
+ - name: host1
+ mac: 'EC:38:8F:79:0C:2C'
+ ipmiUser: root
+ ipmiPass: Huawei@123
+ ipmiIp: 172.16.130.20
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:2D'
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: 'EC:38:8F:79:0C:48'
+ ipmiIp: 172.16.130.19
+ ipmiUser: root
+ ipmiPass: Huawei@123
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:49'
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: 'EC:38:8F:79:10:CC'
+ ipmiIp: 172.16.130.18
+ ipmiUser: root
+ ipmiPass: Huawei@123
+ interfaces:
+ - eth1: 'EC:38:8F:79:10:CD'
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: 'EC:38:8F:79:0C:6C'
+ ipmiIp: 172.16.130.17
+ ipmiUser: root
+ ipmiPass: Huawei@123
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:6D'
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: 'EC:38:8F:7A:E6:ED'
+ ipmiIp: 172.16.130.16
+ ipmiUser: root
+ ipmiPass: Huawei@123
+ interfaces:
+ - eth1: 'EC:38:8F:7A:E6:EE'
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/intel-pod8/network_openo.yml b/deploy/conf/hardware_environment/intel-pod8/network_openo.yml
new file mode 100644
index 00000000..48c47f7d
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/network_openo.yml
@@ -0,0 +1,114 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+nic_mappings: []
+bond_mappings: []
+
+provider_net_mappings:
+ - name: br-prv
+ network: physnet
+ interface: eth1
+ type: ovs
+ role:
+ - controller
+ - compute
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth3
+ vlan_tag: 805
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth2
+ vlan_tag: 804
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: external
+ interface: br-prv
+ type: ovs
+ role:
+ - controller
+ - compute
+
+ip_settings:
+ - name: mgmt
+ ip_ranges:
+ - - "10.8.14.10"
+ - "10.8.14.30"
+ cidr: "10.8.14.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "10.8.12.10"
+ - "10.8.12.30"
+ cidr: "10.8.12.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "10.8.15.10"
+ - "10.8.15.30"
+ cidr: "10.8.15.0/24"
+ gw: "10.8.15.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.8.14.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 10.8.15.222
+ netmask: "24"
+ interface: external
+
+onos_nic: eth4
+public_net_info:
+ enable: "True"
+ network: ext-net
+ type: flat
+ segment_id: 10
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "10.8.15.1"
+ floating_ip_cidr: "10.8.15.0/24"
+ floating_ip_start: "10.8.15.100"
+ floating_ip_end: "10.8.15.200"
+
+openo_net:
+ openo_vm_ip: "10.8.15.50"
+ openo_vm_mask: "255.255.255.0"
+ openo_external_gw: "10.8.15.1"
+ openo_external_cidr: "10.8.15.0/24"
+
+openo_docker_net:
+ docker_ip_start: "10.8.15.51"
+ docker_ip_end: "10.8.15.90"
+
+juju_net:
+ juju_net_cidr: "12.1.1.0/24"
+ juju_net_gw: "12.1.1.1"
diff --git a/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml
new file mode 100644
index 00000000..f70414cf
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod8/os-nosdn-openo-ha.yml
@@ -0,0 +1,81 @@
+##############################################################################
+# Copyright (c) 2017 HUAWEI TECHNOLOGIES CO.,LTD and others.
+#
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+
+---
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiPass: root
+ipmiVer: '1.0'
+
+deploy_options:
+ - orchestrator: open-o
+ - application: clearwater
+
+hosts:
+ - name: host1
+ mac: '00:1E:67:D4:30:D2'
+ interfaces:
+ - eth1: '00:1E:67:D4:30:D1'
+ - eth2: '00:1E:67:C5:5B:28'
+ - eth3: '00:1E:67:C5:5B:29'
+ ipmiIp: 10.2.117.133
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '00:1E:67:D4:39:B5'
+ interfaces:
+ - eth1: '00:1E:67:D4:39:B4'
+ - eth2: '00:1E:67:C5:52:24'
+ - eth3: '00:1E:67:C5:52:25'
+ ipmiIp: 10.2.117.134
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: '00:1E:67:D4:31:B2'
+ interfaces:
+ - eth1: '00:1E:67:D4:31:B1'
+ - eth2: '00:1E:67:C1:FA:E0'
+ - eth3: '00:1E:67:C1:FA:E1'
+ ipmiIp: 10.2.117.135
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: '00:1E:67:D4:34:67'
+ interfaces:
+ - eth1: '00:1E:67:D4:34:66'
+ - eth2: '00:1E:67:E2:58:80'
+ - eth3: '00:1E:67:E2:58:81'
+ ipmiIp: 10.2.117.136
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '00:1E:67:D4:38:42'
+ interfaces:
+ - eth1: '00:1E:67:D4:38:41'
+ - eth2: '00:1E:67:C1:F9:2C'
+ - eth3: '00:1E:67:C1:F9:2D'
+ ipmiIp: 10.2.117.137
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/vm_environment/os-nosdn-openo-noha.yml b/deploy/conf/vm_environment/os-nosdn-openo-ha.yml
index 45d29a3b..c26567f3 100644
--- a/deploy/conf/vm_environment/os-nosdn-openo-noha.yml
+++ b/deploy/conf/vm_environment/os-nosdn-openo-ha.yml
@@ -13,6 +13,7 @@ FLAVOR: cluster
deploy_options:
- orchestrator: open-o
+ - application: clearwater
hosts:
- name: host1