summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshuai chen <chenshuai@huawei.com>2016-08-17 07:37:45 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-08-17 07:37:45 +0000
commitda430dc79198786e75e805921c94969e79e0a833 (patch)
treed2c517b3b22b4feb6b4364df471e6cb58c1612a9
parent9d6451426eb12ae4373ba1e526728a0ccf42886b (diff)
parentba295febcb4a37eb9dcfc8c00c0c8ff9b3c3a27d (diff)
Merge "[compass] add new pod configuration"
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network.yml90
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml90
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/network_onos.yml90
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml63
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml62
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml68
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml66
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml68
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml66
-rw-r--r--deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml68
10 files changed, 731 insertions, 0 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network.yml b/deploy/conf/hardware_environment/huawei-pod5/network.yml
new file mode 100644
index 00000000..dbaba01c
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/network.yml
@@ -0,0 +1,90 @@
+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: 125
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ vlan_tag: 126
+ 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:
+ - - "10.145.140.100"
+ - "10.145.140.105"
+ cidr: "10.145.140.0/24"
+ gw: "10.145.140.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 10.145.140.115
+ 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: "10.145.140.1"
+ floating_ip_cidr: "10.145.140.0/24"
+ floating_ip_start: "10.145.140.100"
+ floating_ip_end: "10.145.140.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
new file mode 100644
index 00000000..b15ce35a
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_ocl.yml
@@ -0,0 +1,90 @@
+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: 125
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ vlan_tag: 126
+ 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:
+ - - "10.145.140.100"
+ - "10.145.140.105"
+ cidr: "10.145.140.0/24"
+ gw: "10.145.140.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 10.145.140.115
+ 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: "100.100.100.1"
+ floating_ip_cidr: "100.100.100.0/24"
+ floating_ip_start: "100.100.100.30"
+ floating_ip_end: "100.100.100.120"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
new file mode 100644
index 00000000..6c543b48
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/network_onos.yml
@@ -0,0 +1,90 @@
+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: 125
+ type: vlan
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ interface: eth1
+ vlan_tag: 126
+ 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:
+ - - "10.145.140.100"
+ - "10.145.140.105"
+ cidr: "10.145.140.0/24"
+ gw: "10.145.140.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 172.16.1.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 10.145.140.115
+ netmask: "24"
+ interface: external
+
+onos_nic: eth2
+public_net_info:
+ enable: True
+ network: ext-net
+ type: vxlan
+ segment_id: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: False
+ no_gateway: False
+ external_gw: "10.145.140.1"
+ floating_ip_cidr: "10.145.140.0/24"
+ floating_ip_start: "10.145.140.100"
+ floating_ip_end: "10.145.140.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
new file mode 100644
index 00000000..56428daa
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,63 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - ceph-mon
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
new file mode 100644
index 00000000..65f31383
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-ocl-nofeature-ha.yml
@@ -0,0 +1,62 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - opencontrail
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
new file mode 100644
index 00000000..e19937ec
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-moon-ha.yml
@@ -0,0 +1,68 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+moon: "Enable"
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
new file mode 100644
index 00000000..3b01d83d
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l2-nofeature-ha.yml
@@ -0,0 +1,66 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
new file mode 100644
index 00000000..dbc261a0
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,68 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+odl_l3_agent: "Enable"
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
new file mode 100644
index 00000000..cff1bcf2
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-nofeature-ha.yml
@@ -0,0 +1,66 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - onos
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - onos
+ - ceph-mon
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - onos
+ - ceph-mon
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
diff --git a/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
new file mode 100644
index 00000000..435d4481
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod5/os-onos-sfc-ha.yml
@@ -0,0 +1,68 @@
+
+TYPE: baremetal
+FLAVOR: cluster
+POWER_TOOL: ipmitool
+
+ipmiUser: root
+ipmiVer: '2.0'
+
+onos_sfc: "Enable"
+
+hosts:
+ - name: host1
+ mac: '70:7b:e8:75:71:d3'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d2'
+ ipmiIp: 172.31.123.2
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - onos
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: '70:7b:e8:75:72:21'
+ interfaces:
+ - eth1: '70:7b:e8:75:72:20'
+ ipmiIp: 172.31.123.3
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - onos
+ - ceph-mon
+
+ - name: host3
+ mac: '70:7b:e8:75:71:37'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:36'
+ ipmiIp: 172.31.123.4
+ ipmiPass: root
+ roles:
+ - controller
+ - ha
+ - onos
+ - ceph-mon
+
+ - name: host4
+ mac: '70:7b:e8:75:71:dc'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:db'
+ ipmiIp: 172.31.123.5
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+
+ - name: host5
+ mac: '70:7b:e8:75:71:d6'
+ interfaces:
+ - eth1: '70:7b:e8:75:71:d5'
+ ipmiIp: 172.31.123.6
+ ipmiPass: root
+ roles:
+ - compute
+ - ceph-osd
+