Add DHA and network files for intel pod17

Intel Pod17 is ready now, this patch is proposed to add
DHA and network yml files for it. Then we can run some
daily BM deployments on it.

Change-Id: I1431295b3f7c70afb6ee77979e0eb75972d94bc1
Signed-off-by: Yifei Xue <xueyifei@huawei.com>

diff --git a/deploy/conf/hardware_environment/intel-pod17/k8-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod17/k8-nosdn-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..7cc2c21
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/k8-nosdn-nofeature-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'
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - kube_master
+      - etcd
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - kube_master
+      - etcd
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - kube_master
+      - etcd
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - kube_node
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - kube_node

diff --git a/deploy/conf/hardware_environment/intel-pod17/network.yml b/deploy/conf/hardware_environment/intel-pod17/network.yml
new file mode 100644 (file)
index 0000000..bb6f513
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/network.yml
@@ -0,0 +1,126 @@
+##############################################################################
+# 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-provider
+    network: physnet
+    interface: eth10
+    type: ovs
+    role:
+      - controller
+
+sys_intf_mappings:
+  - name: mgmt
+    interface: eth0
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    interface: eth2
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    interface: eth3
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: external
+    interface: eth1
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+ip_settings:
+  - name: mgmt
+    ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
+      - - "10.10.172.2"
+        - "10.10.172.50"
+    cidr: "10.10.172.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    ip_ranges:
+      - - "10.10.173.2"
+        - "10.10.173.50"
+    cidr: "10.10.173.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: external
+    ip_ranges:
+      - - "10.10.170.21"
+        - "10.10.170.25"
+    cidr: "10.10.170.0/24"
+    gw: "10.10.170.1"
+    role:
+      - controller
+      - compute
+
+internal_vip:
+  ip: 10.1.0.222
+  netmask: "24"
+  interface: mgmt
+
+public_vip:
+  ip: 10.10.170.222
+  netmask: "24"
+  interface: external
+
+onos_nic: eth2
+tenant_net_info:
+  type: vxlan
+  range: "1:1000"
+  provider_network: None
+
+public_net_info:
+  enable: "True"
+  network: ext-net
+  type: flat
+  segment_id: 170
+  subnet: ext-subnet
+  provider_network: physnet
+  router: router-ext
+  enable_dhcp: "False"
+  no_gateway: "False"
+  external_gw: "10.10.170.1"
+  floating_ip_cidr: "10.10.170.0/24"
+  floating_ip_start: "10.10.170.100"
+  floating_ip_end: "10.10.170.200"

diff --git a/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml b/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml
new file mode 100644 (file)
index 0000000..7cc421e
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/network_dpdk.yml
@@ -0,0 +1,132 @@
+##############################################################################
+# 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-provider
+    network: physnet
+    interface: eth10
+    type: ovs
+    role:
+      - controller
+
+sys_intf_mappings:
+  - name: mgmt
+    interface: eth0
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    interface: eth2
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+
+  - name: tenant
+    interface: eth2
+    type: dpdk
+    vlan_tag: None
+    role:
+      - compute
+
+  - name: storage
+    interface: eth3
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+  - name: external
+    interface: eth1
+    type: normal
+    vlan_tag: None
+    role:
+      - controller
+      - compute
+
+ip_settings:
+  - name: mgmt
+    ip_ranges:
+      - - "10.1.0.50"
+        - "10.1.0.100"
+    dhcp_ranges:
+      - - "10.1.0.2"
+        - "10.1.0.49"
+    cidr: "10.1.0.0/24"
+    gw: "10.1.0.1"
+    role:
+      - controller
+      - compute
+
+  - name: tenant
+    ip_ranges:
+      - - "10.10.172.2"
+        - "10.10.172.50"
+    cidr: "10.10.172.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    ip_ranges:
+      - - "10.10.173.2"
+        - "10.10.173.50"
+    cidr: "10.10.173.0/24"
+    role:
+      - controller
+      - compute
+
+  - name: external
+    ip_ranges:
+      - - "10.10.170.21"
+        - "10.10.170.25"
+    cidr: "10.10.170.0/24"
+    gw: "10.10.170.1"
+    role:
+      - controller
+      - compute
+
+internal_vip:
+  ip: 10.1.0.222
+  netmask: "24"
+  interface: mgmt
+
+public_vip:
+  ip: 10.10.170.222
+  netmask: "24"
+  interface: external
+
+onos_nic: eth2
+tenant_net_info:
+  type: vxlan
+  range: "1:1000"
+  provider_network: None
+
+public_net_info:
+  enable: "True"
+  network: ext-net
+  type: flat
+  segment_id: 170
+  subnet: ext-subnet
+  provider_network: physnet
+  router: router-ext
+  enable_dhcp: "False"
+  no_gateway: "False"
+  external_gw: "10.10.170.1"
+  floating_ip_cidr: "10.10.170.0/24"
+  floating_ip_start: "10.10.170.100"
+  floating_ip_end: "10.10.170.200"

diff --git a/deploy/conf/hardware_environment/intel-pod17/os-nosdn-kvm-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-kvm-ha.yml
new file mode 100644 (file)
index 0000000..6f80c5f
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-kvm-ha.yml
@@ -0,0 +1,84 @@
+##############################################################################
+# 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'
+
+plugins:
+  - rt_kvm: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd

diff --git a/deploy/conf/hardware_environment/intel-pod17/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..ebe1bc9
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,81 @@
+##############################################################################
+# 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'
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd

diff --git a/deploy/conf/hardware_environment/intel-pod17/os-nosdn-ovs_dpdk-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-ovs_dpdk-ha.yml
new file mode 100644 (file)
index 0000000..35664e1
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-nosdn-ovs_dpdk-ha.yml
@@ -0,0 +1,84 @@
+##############################################################################
+# 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'
+
+plugins:
+  - dpdk: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd

diff --git a/deploy/conf/hardware_environment/intel-pod17/os-odl-sfc-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-odl-sfc-ha.yml
new file mode 100644 (file)
index 0000000..f2af9b3
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-odl-sfc-ha.yml
@@ -0,0 +1,86 @@
+##############################################################################
+# 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'
+
+odl_l3_agent: "Enable"
+plugins:
+  - opendaylight: "Enable"
+  - odl_sfc: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd

diff --git a/deploy/conf/hardware_environment/intel-pod17/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-odl_l2-moon-ha.yml
new file mode 100644 (file)
index 0000000..86c3f93
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-odl_l2-moon-ha.yml
@@ -0,0 +1,85 @@
+##############################################################################
+# 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'
+
+plugins:
+  - opendaylight: "Enable"
+  - moon: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd

diff --git a/deploy/conf/hardware_environment/intel-pod17/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/intel-pod17/os-odl_l3-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..2be852a
--- /dev/null
+++ b/deploy/conf/hardware_environment/intel-pod17/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,85 @@
+##############################################################################
+# 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'
+
+odl_l3_agent: "Enable"
+plugins:
+  - opendaylight: "Enable"
+
+hosts:
+  - name: host1
+    mac: 'A4:BF:01:16:31:DD'
+    interfaces:
+      - eth1: 'A4:BF:01:16:31:DC'
+      - eth2: '3C:FD:FE:A4:9C:D0'
+      - eth3: '3C:FD:FE:A4:9C:D1'
+    ipmiIp: 10.10.170.11
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: 'A4:BF:01:14:01:13'
+    interfaces:
+      - eth1: 'A4:BF:01:14:01:12'
+      - eth2: '3C:FD:FE:A4:9D:20'
+      - eth3: '3C:FD:FE:A4:9D:21'
+    ipmiIp: 10.10.170.12
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host3
+    mac: 'A4:BF:01:14:71:1E'
+    interfaces:
+      - eth1: 'A4:BF:01:14:71:1D'
+      - eth2: '3C:FD:FE:A4:A0:78'
+      - eth3: '3C:FD:FE:A4:A0:79'
+    ipmiIp: 10.10.170.13
+    ipmiPass: root
+    roles:
+      - controller
+      - ha
+      - ceph-mon
+
+  - name: host4
+    mac: 'A4:BF:01:16:2F:17'
+    interfaces:
+      - eth1: 'A4:BF:01:16:2F:16'
+      - eth2: '3C:FD:FE:A4:9D:00'
+      - eth3: '3C:FD:FE:A4:9D:01'
+    ipmiIp: 10.10.170.14
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: 'A4:BF:01:14:2B:BB'
+    interfaces:
+      - eth1: 'A4:BF:01:14:2B:BA'
+      - eth2: '3C:FD:FE:A4:A0:68'
+      - eth3: '3C:FD:FE:A4:A0:69'
+    ipmiIp: 10.10.170.15
+    ipmiPass: root
+    roles:
+      - compute
+      - ceph-osd