Code Review / compass4nfv.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | patch | inline | side by side (parent: b0a8c32)
Add huawei-pod7 network.yml and DHA 95/42495/3
authorwutianwei <wutianwei1@huawei.com>
Wed, 20 Sep 2017 09:28:08 +0000 (17:28 +0800)
committerwutianwei <wutianwei1@huawei.com>
Wed, 20 Sep 2017 10:32:17 +0000 (18:32 +0800)
dovetail need run in danube, we trigger compass4nfv in huawei-pod7 for davetail

Change-Id: I7cc89ceb3db872fee4a33d05f650289b38053436
Signed-off-by: wutianwei <wutianwei1@huawei.com>
deploy/conf/hardware_environment/huawei-pod7/network.yml [new file with mode: 0644] patch | blob
deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml [new file with mode: 0644] patch | blob
deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml [new file with mode: 0644] patch | blob

diff --git a/deploy/conf/hardware_environment/huawei-pod7/network.yml b/deploy/conf/hardware_environment/huawei-pod7/network.yml
new file mode 100644 (file)
index 0000000..e255c69
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/network.yml
@@ -0,0 +1,100 @@
+##############################################################################
+# 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: eth1
+    vlan_tag: 2001
+    type: vlan
+    role:
+      - controller
+      - compute
+
+  - name: storage
+    interface: eth1
+    vlan_tag: 2002
+    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.20.10"
+        - "192.168.20.50"
+    cidr: "192.168.20.0/24"
+    gw: "192.168.20.250"
+    role:
+      - controller
+      - compute
+
+internal_vip:
+  ip: 172.16.1.222
+  netmask: "24"
+  interface: mgmt
+
+public_vip:
+  ip: 192.168.20.222
+  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.20.250"
+  floating_ip_cidr: "192.168.20.0/24"
+  floating_ip_start: "192.168.20.100"
+  floating_ip_end: "192.168.20.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..71cac58
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/os-nosdn-nofeature-ha.yml
@@ -0,0 +1,65 @@
+##############################################################################
+# 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
+ipmiVer: '2.0'
+
+hosts:
+  - name: host1
+    mac: '88:cf:98:61:66:77'
+    interfaces:
+      - eth1: '88:CF:98:61:66:76'
+    ipmiIp: 192.168.120.12
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+
+  - name: host2
+    mac: '88:cf:98:61:66:c9'
+    interfaces:
+      - eth1: '88:CF:98:61:66:C8'
+    ipmiIp: 192.168.120.13
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+
+  - name: host3
+    mac: '88:cf:98:83:31:98'
+    interfaces:
+      - eth1: '88:CF:98:83:31:97'
+    ipmiIp: 192.168.120.14
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+
+  - name: host4
+    mac: '88:cf:98:61:67:09'
+    interfaces:
+      - eth1: '88:CF:98:61:67:08'
+    ipmiIp: 192.168.120.15
+    ipmiPass: Opnfv@pod7
+    roles:
+      - compute
+
+  - name: host5
+    mac: '88:cf:98:83:31:e4'
+    interfaces:
+      - eth1: '88:CF:98:83:31:E3'
+    ipmiIp: 192.168.120.16
+    ipmiPass: Opnfv@pod7
+    roles:
+      - compute
diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..d117d2f
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l2-nofeature-ha.yml
@@ -0,0 +1,74 @@
+##############################################################################
+# 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
+ipmiVer: '2.0'
+
+hosts:
+  - name: host1
+    mac: '88:cf:98:61:66:77'
+    interfaces:
+      - eth1: '88:CF:98:61:66:76'
+    ipmiIp: 192.168.120.12
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: '88:cf:98:61:66:c9'
+    interfaces:
+      - eth1: '88:CF:98:61:66:C8'
+    ipmiIp: 192.168.120.13
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host3
+    mac: '88:cf:98:83:31:98'
+    interfaces:
+      - eth1: '88:CF:98:83:31:97'
+    ipmiIp: 192.168.120.14
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host4
+    mac: '88:cf:98:61:67:09'
+    interfaces:
+      - eth1: '88:CF:98:61:67:08'
+    ipmiIp: 192.168.120.15
+    ipmiPass: Opnfv@pod7
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: '88:cf:98:83:31:e4'
+    interfaces:
+      - eth1: '88:CF:98:83:31:E3'
+    ipmiIp: 192.168.120.16
+    ipmiPass: Opnfv@pod7
+    roles:
+      - compute
+      - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml
new file mode 100644 (file)
index 0000000..987a773
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod7/os-odl_l3-nofeature-ha.yml
@@ -0,0 +1,75 @@
+##############################################################################
+# 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
+ipmiVer: '2.0'
+
+odl_l3_agent: "Enable"
+hosts:
+  - name: host1
+    mac: '88:cf:98:61:66:77'
+    interfaces:
+      - eth1: '88:CF:98:61:66:76'
+    ipmiIp: 192.168.120.12
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-adm
+      - ceph-mon
+
+  - name: host2
+    mac: '88:cf:98:61:66:c9'
+    interfaces:
+      - eth1: '88:CF:98:61:66:C8'
+    ipmiIp: 192.168.120.13
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host3
+    mac: '88:cf:98:83:31:98'
+    interfaces:
+      - eth1: '88:CF:98:83:31:97'
+    ipmiIp: 192.168.120.14
+    ipmiPass: Opnfv@pod7
+    roles:
+      - controller
+      - ha
+      - odl
+      - ceph-mon
+
+  - name: host4
+    mac: '88:cf:98:61:67:09'
+    interfaces:
+      - eth1: '88:CF:98:61:67:08'
+    ipmiIp: 192.168.120.15
+    ipmiPass: Opnfv@pod7
+    roles:
+      - compute
+      - ceph-osd
+
+  - name: host5
+    mac: '88:cf:98:83:31:e4'
+    interfaces:
+      - eth1: '88:CF:98:83:31:E3'
+    ipmiIp: 192.168.120.16
+    ipmiPass: Opnfv@pod7
+    roles:
+      - compute
+      - ceph-osd