summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorwutianwei <wutianwei1@huawei.com>2017-09-28 11:25:49 +0800
committerwutianwei <wutianwei1@huawei.com>2017-09-28 11:25:49 +0800
commitf70d3aa8ffe7878e86b8f12c91c99018924a74b3 (patch)
tree2c7ffc1bb2e80dda601cbff5a14ccf3147c92f27
parentfb952b8c4cb4a47ad33cf7f7c3a06b83954343a2 (diff)
Modify the network and DHA files
Due to pod2 virtual3 and virtual4 run danube before, we need to change the network and DHA to run euphrates Change-Id: I720138cb960cc6f3a57bf5f777c0debb80f64eba Signed-off-by: wutianwei <wutianwei1@huawei.com>
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/os-nosdn-ovs_dpdk-ha.yml (renamed from deploy/conf/hardware_environment/huawei-pod1/os-nosdn-dpdk-ha.yml)0
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network.yml56
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml6
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_onos.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_openo.yml10
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-kvm-ha.yml80
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-nosdn-ovs_dpdk-ha.yml79
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl-sfc-ha.yml86
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml5
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network.yml64
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml132
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml10
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_onos.yml18
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_openo.yml20
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network.yml64
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml132
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml10
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_onos.yml18
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_openo.yml20
-rw-r--r--deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml132
-rw-r--r--deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml132
-rw-r--r--deploy/conf/vm_environment/os-nosdn-ovs_dpdk-ha.yml (renamed from deploy/conf/vm_environment/os-nosdn-dpdk-ha.yml)0
-rw-r--r--deploy/conf/vm_environment/os-nosdn-ovs_dpdk-noha.yml (renamed from deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml)0
23 files changed, 967 insertions, 117 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-dpdk-ha.yml b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-ovs_dpdk-ha.yml
index 34640ac1..34640ac1 100644
--- a/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-dpdk-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod1/os-nosdn-ovs_dpdk-ha.yml
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network.yml b/deploy/conf/hardware_environment/huawei-pod2/network.yml
index 7ea69819..ccf66a47 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network.yml
@@ -12,34 +12,42 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-prv
+ - name: br-provider
network: physnet
- interface: eth1
+ interface: eth10
type: ovs
role:
- controller
- - compute
sys_intf_mappings:
- name: mgmt
+ interface: eth0
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
interface: eth1
+ type: normal
vlan_tag: 101
- type: vlan
role:
- controller
- compute
- name: storage
interface: eth1
+ type: normal
vlan_tag: 102
- type: vlan
role:
- controller
- compute
- name: external
- interface: br-prv
- type: ovs
+ interface: eth1
+ type: normal
+ vlan_tag: None
role:
- controller
- compute
@@ -47,8 +55,21 @@ sys_intf_mappings:
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:
- - "172.16.1.1"
- - "172.16.1.254"
+ - "172.16.1.50"
cidr: "172.16.1.0/24"
role:
- controller
@@ -57,7 +78,7 @@ ip_settings:
- name: storage
ip_ranges:
- - "172.16.2.1"
- - "172.16.2.254"
+ - "172.16.2.50"
cidr: "172.16.2.0/24"
role:
- controller
@@ -66,7 +87,7 @@ ip_settings:
- name: external
ip_ranges:
- - "192.168.11.10"
- - "192.168.11.15"
+ - "192.168.11.50"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -74,21 +95,26 @@ ip_settings:
- compute
internal_vip:
- ip: 172.16.1.222
+ ip: 10.1.0.222
netmask: "24"
interface: mgmt
public_vip:
- ip: 192.168.11.18
+ ip: 192.168.11.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: 1000
+ segment_id: 10
subnet: ext-subnet
provider_network: physnet
router: router-ext
@@ -96,5 +122,5 @@ public_net_info:
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"
+ floating_ip_start: "192.168.11.100"
+ floating_ip_end: "192.168.11.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml b/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml
index 60ee393e..dc01aa1a 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_ocl.yml
@@ -66,7 +66,7 @@ ip_settings:
- name: external
ip_ranges:
- - "192.168.11.10"
- - "192.168.11.15"
+ - "192.168.11.50"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.11.18
+ ip: 192.168.11.51
netmask: "24"
interface: external
@@ -88,7 +88,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 1000
+ segment_id: 10
subnet: ext-subnet
provider_network: physnet
router: router-ext
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml b/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml
index ada82be9..2322e075 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_onos.yml
@@ -66,7 +66,7 @@ ip_settings:
- name: external
ip_ranges:
- - "192.168.11.10"
- - "192.168.11.15"
+ - "192.168.11.50"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.11.18
+ ip: 192.168.11.51
netmask: "24"
interface: external
@@ -88,7 +88,7 @@ public_net_info:
enable: "True"
network: ext-net
type: vxlan
- segment_id: 1000
+ segment_id: 10
subnet: ext-subnet
provider_network: physnet
router: router-ext
@@ -96,5 +96,5 @@ public_net_info:
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"
+ floating_ip_start: "192.168.11.100"
+ floating_ip_end: "192.168.11.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml b/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml
index 1bba2daa..0672a75f 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_openo.yml
@@ -66,7 +66,7 @@ ip_settings:
- name: external
ip_ranges:
- - "192.168.11.10"
- - "192.168.11.15"
+ - "192.168.11.50"
cidr: "192.168.11.0/24"
gw: "192.168.11.1"
role:
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.11.18
+ ip: 192.168.11.51
netmask: "24"
interface: external
@@ -93,7 +93,7 @@ public_net_info:
enable: "True"
network: ext-net
type: flat
- segment_id: 1000
+ segment_id: 10
subnet: ext-subnet
provider_network: physnet
router: router-ext
@@ -101,5 +101,5 @@ public_net_info:
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"
+ floating_ip_start: "192.168.11.100"
+ floating_ip_end: "192.168.11.200"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-kvm-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-kvm-ha.yml
new file mode 100644
index 00000000..4895b581
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-kvm-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'
+
+
+plugins:
+ - rt_kvm: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'EC:38:8F:79:0C:2C'
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ 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: Opnfv@pod2
+ 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: Opnfv@pod2
+ 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: Opnfv@pod2
+ 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: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:7A:E6:EE'
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-ovs_dpdk-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-ovs_dpdk-ha.yml
new file mode 100644
index 00000000..85dd4570
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-nosdn-ovs_dpdk-ha.yml
@@ -0,0 +1,79 @@
+##############################################################################
+# 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'
+
+plugins:
+ - dpdk: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'EC:38:8F:79:0C:2C'
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ 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: Opnfv@pod2
+ 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: Opnfv@pod2
+ 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: Opnfv@pod2
+ 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: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:7A:E6:EE'
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl-sfc-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl-sfc-ha.yml
new file mode 100644
index 00000000..1a8a12a0
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/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
+
+ipmiVer: '2.0'
+
+odl_l3_agent: "Enable"
+plugins:
+ - opendaylight: "Enable"
+ - odl_sfc: "Enable"
+
+hosts:
+ - name: host1
+ mac: 'EC:38:8F:79:0C:2C'
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ ipmiIp: 172.16.130.20
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:2D'
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-adm
+ - ceph-mon
+
+ - name: host2
+ mac: 'EC:38:8F:79:0C:48'
+ ipmiIp: 172.16.130.19
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:79:0C:49'
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+
+ - name: host3
+ mac: 'EC:38:8F:79:10:CC'
+ ipmiIp: 172.16.130.18
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:79:10:CD'
+ roles:
+ - controller
+ - ha
+ - odl
+ - ceph-mon
+
+
+ - name: host4
+ mac: 'EC:38:8F:79:0C:6C'
+ ipmiIp: 172.16.130.17
+ ipmiUser: root
+ ipmiPass: Opnfv@pod2
+ 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: Opnfv@pod2
+ interfaces:
+ - eth1: 'EC:38:8F:7A:E6:EE'
+ roles:
+ - compute
+ - ceph-osd
diff --git a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
index 86da1dfb..7cc5cc66 100644
--- a/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
+++ b/deploy/conf/hardware_environment/huawei-pod2/os-odl_l2-moon-ha.yml
@@ -15,9 +15,9 @@ POWER_TOOL: ipmitool
ipmiVer: '2.0'
-moon: "Enable"
plugins:
- opendaylight: "Enable"
+ - moon: "Enable"
hosts:
- name: host1
@@ -81,5 +81,4 @@ hosts:
interfaces:
- eth1: 'EC:38:8F:7A:E6:EE'
roles:
- - compute
- - ceph-osd
+ - moon
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network.yml b/deploy/conf/vm_environment/huawei-virtual3/network.yml
index 40238276..4359202e 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network.yml
@@ -12,34 +12,42 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-prv
+ - name: br-provider
network: physnet
- interface: eth1
+ interface: eth10
type: ovs
role:
- controller
- - compute
sys_intf_mappings:
- name: mgmt
+ interface: eth0
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
interface: eth1
+ type: normal
vlan_tag: 101
- type: vlan
role:
- controller
- compute
- name: storage
interface: eth1
+ type: normal
vlan_tag: 102
- type: vlan
role:
- controller
- compute
- name: external
- interface: br-prv
- type: ovs
+ interface: eth1
+ type: normal
+ vlan_tag: None
role:
- controller
- compute
@@ -47,8 +55,21 @@ sys_intf_mappings:
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:
- - "172.16.1.1"
- - "172.16.1.254"
+ - "172.16.1.50"
cidr: "172.16.1.0/24"
role:
- controller
@@ -57,7 +78,7 @@ ip_settings:
- name: storage
ip_ranges:
- - "172.16.2.1"
- - "172.16.2.254"
+ - "172.16.2.50"
cidr: "172.16.2.0/24"
role:
- controller
@@ -65,25 +86,30 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
- cidr: "192.168.101.0/24"
- gw: "192.168.101.1"
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
role:
- controller
- compute
internal_vip:
- ip: 172.16.1.222
+ ip: 10.1.0.222
netmask: "24"
interface: mgmt
public_vip:
- ip: 192.168.101.222
+ ip: 192.16.1.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
@@ -94,7 +120,7 @@ public_net_info:
router: router-ext
enable_dhcp: "False"
no_gateway: "False"
- external_gw: "192.168.101.1"
- floating_ip_cidr: "192.168.101.0/24"
- floating_ip_start: "192.168.101.101"
- floating_ip_end: "192.168.101.199"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual3/network_dpdk.yml
new file mode 100644
index 00000000..e196d6f4
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual3/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: eth1
+ type: normal
+ vlan_tag: 102
+ 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:
+ - - "172.16.1.1"
+ - "172.16.1.50"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.50"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.16.1.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: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
index dfda8d02..b5a57103 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_ocl.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
- cidr: "192.168.101.0/24"
- gw: "192.168.101.1"
+ - - "192.168.107.210"
+ - "192.168.107.220"
+ cidr: "192.168.107.0/24"
+ gw: "192.168.107.1"
role:
- controller
- compute
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.101.222
+ ip: 192.168.107.222
netmask: "24"
interface: external
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
index 550093e5..ce5353eb 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_onos.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
- cidr: "192.168.101.0/24"
- gw: "192.168.101.1"
+ - - "192.168.107.210"
+ - "192.168.107.220"
+ cidr: "192.168.107.0/24"
+ gw: "192.168.107.1"
role:
- controller
- compute
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.101.222
+ ip: 192.168.107.222
netmask: "24"
interface: external
@@ -94,7 +94,7 @@ public_net_info:
router: router-ext
enable_dhcp: "False"
no_gateway: "False"
- external_gw: "192.168.101.1"
- floating_ip_cidr: "192.168.101.0/24"
- floating_ip_start: "192.168.101.101"
- floating_ip_end: "192.168.101.199"
+ external_gw: "192.168.107.1"
+ floating_ip_cidr: "192.168.107.0/24"
+ floating_ip_start: "192.168.107.101"
+ floating_ip_end: "192.168.107.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
index fd2e2c0f..e0663439 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_openo.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.101.210"
- - "192.168.101.220"
- cidr: "192.168.101.0/24"
- gw: "192.168.101.1"
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
role:
- controller
- compute
@@ -79,12 +79,12 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.101.222
+ ip: 192.16.1.222
netmask: "24"
interface: external
openo_net:
- openo_ip: 192.168.101.50
+ openo_ip: 192.16.1.50
openo_docker_gw: 172.11.1.1
openo_docker_cidr: 172.11.1.0/24
@@ -99,7 +99,7 @@ public_net_info:
router: router-ext
enable_dhcp: "False"
no_gateway: "False"
- external_gw: "192.168.101.1"
- floating_ip_cidr: "192.168.101.0/24"
- floating_ip_start: "192.168.101.101"
- floating_ip_end: "192.168.101.199"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network.yml b/deploy/conf/vm_environment/huawei-virtual4/network.yml
index d01a79ec..4359202e 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network.yml
@@ -12,34 +12,42 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-prv
+ - name: br-provider
network: physnet
- interface: eth1
+ interface: eth10
type: ovs
role:
- controller
- - compute
sys_intf_mappings:
- name: mgmt
+ interface: eth0
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
interface: eth1
+ type: normal
vlan_tag: 101
- type: vlan
role:
- controller
- compute
- name: storage
interface: eth1
+ type: normal
vlan_tag: 102
- type: vlan
role:
- controller
- compute
- name: external
- interface: br-prv
- type: ovs
+ interface: eth1
+ type: normal
+ vlan_tag: None
role:
- controller
- compute
@@ -47,8 +55,21 @@ sys_intf_mappings:
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:
- - "172.16.1.1"
- - "172.16.1.254"
+ - "172.16.1.50"
cidr: "172.16.1.0/24"
role:
- controller
@@ -57,7 +78,7 @@ ip_settings:
- name: storage
ip_ranges:
- - "172.16.2.1"
- - "172.16.2.254"
+ - "172.16.2.50"
cidr: "172.16.2.0/24"
role:
- controller
@@ -65,25 +86,30 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
- cidr: "192.168.103.0/24"
- gw: "192.168.103.1"
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
role:
- controller
- compute
internal_vip:
- ip: 172.16.1.222
+ ip: 10.1.0.222
netmask: "24"
interface: mgmt
public_vip:
- ip: 192.168.103.222
+ ip: 192.16.1.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
@@ -94,7 +120,7 @@ public_net_info:
router: router-ext
enable_dhcp: "False"
no_gateway: "False"
- external_gw: "192.168.103.1"
- floating_ip_cidr: "192.168.103.0/24"
- floating_ip_start: "192.168.103.101"
- floating_ip_end: "192.168.103.199"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual4/network_dpdk.yml
new file mode 100644
index 00000000..e196d6f4
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual4/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: eth1
+ type: normal
+ vlan_tag: 102
+ 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:
+ - - "172.16.1.1"
+ - "172.16.1.50"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.50"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.16.1.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: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml b/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml
index 07fdcdf2..b5a57103 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_ocl.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
- cidr: "192.168.103.0/24"
- gw: "192.168.103.1"
+ - - "192.168.107.210"
+ - "192.168.107.220"
+ cidr: "192.168.107.0/24"
+ gw: "192.168.107.1"
role:
- controller
- compute
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.103.222
+ ip: 192.168.107.222
netmask: "24"
interface: external
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml b/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml
index c51138cd..ce5353eb 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_onos.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
- cidr: "192.168.103.0/24"
- gw: "192.168.103.1"
+ - - "192.168.107.210"
+ - "192.168.107.220"
+ cidr: "192.168.107.0/24"
+ gw: "192.168.107.1"
role:
- controller
- compute
@@ -79,7 +79,7 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.103.222
+ ip: 192.168.107.222
netmask: "24"
interface: external
@@ -94,7 +94,7 @@ public_net_info:
router: router-ext
enable_dhcp: "False"
no_gateway: "False"
- external_gw: "192.168.103.1"
- floating_ip_cidr: "192.168.103.0/24"
- floating_ip_start: "192.168.103.101"
- floating_ip_end: "192.168.103.199"
+ external_gw: "192.168.107.1"
+ floating_ip_cidr: "192.168.107.0/24"
+ floating_ip_start: "192.168.107.101"
+ floating_ip_end: "192.168.107.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml b/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml
index dfa1f177..e0663439 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_openo.yml
@@ -65,10 +65,10 @@ ip_settings:
- name: external
ip_ranges:
- - - "192.168.103.210"
- - "192.168.103.220"
- cidr: "192.168.103.0/24"
- gw: "192.168.103.1"
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
role:
- controller
- compute
@@ -79,12 +79,12 @@ internal_vip:
interface: mgmt
public_vip:
- ip: 192.168.103.222
+ ip: 192.16.1.222
netmask: "24"
interface: external
openo_net:
- openo_ip: 192.168.103.50
+ openo_ip: 192.16.1.50
openo_docker_gw: 172.11.1.1
openo_docker_cidr: 172.11.1.0/24
@@ -99,7 +99,7 @@ public_net_info:
router: router-ext
enable_dhcp: "False"
no_gateway: "False"
- external_gw: "192.168.103.1"
- floating_ip_cidr: "192.168.103.0/24"
- floating_ip_start: "192.168.103.101"
- floating_ip_end: "192.168.103.199"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual8/network_dpdk.yml
new file mode 100644
index 00000000..e196d6f4
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual8/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: eth1
+ type: normal
+ vlan_tag: 102
+ 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:
+ - - "172.16.1.1"
+ - "172.16.1.50"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.50"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.16.1.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: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml b/deploy/conf/vm_environment/huawei-virtual9/network_dpdk.yml
new file mode 100644
index 00000000..e196d6f4
--- /dev/null
+++ b/deploy/conf/vm_environment/huawei-virtual9/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: eth1
+ type: normal
+ vlan_tag: 102
+ 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:
+ - - "172.16.1.1"
+ - "172.16.1.50"
+ cidr: "172.16.1.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: storage
+ ip_ranges:
+ - - "172.16.2.1"
+ - "172.16.2.50"
+ cidr: "172.16.2.0/24"
+ role:
+ - controller
+ - compute
+
+ - name: external
+ ip_ranges:
+ - - "192.16.1.210"
+ - "192.16.1.220"
+ cidr: "192.16.1.0/24"
+ gw: "192.16.1.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.16.1.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: 1000
+ subnet: ext-subnet
+ provider_network: physnet
+ router: router-ext
+ enable_dhcp: "False"
+ no_gateway: "False"
+ external_gw: "192.16.1.1"
+ floating_ip_cidr: "192.16.1.0/24"
+ floating_ip_start: "192.16.1.101"
+ floating_ip_end: "192.16.1.199"
diff --git a/deploy/conf/vm_environment/os-nosdn-dpdk-ha.yml b/deploy/conf/vm_environment/os-nosdn-ovs_dpdk-ha.yml
index 3cd05faf..3cd05faf 100644
--- a/deploy/conf/vm_environment/os-nosdn-dpdk-ha.yml
+++ b/deploy/conf/vm_environment/os-nosdn-ovs_dpdk-ha.yml
diff --git a/deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml b/deploy/conf/vm_environment/os-nosdn-ovs_dpdk-noha.yml
index 9fc2ca3f..9fc2ca3f 100644
--- a/deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml
+++ b/deploy/conf/vm_environment/os-nosdn-ovs_dpdk-noha.yml