aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarry Huang <huangxiangyu5@huawei.com>2018-08-03 09:42:42 +0800
committerHarry Huang <huangxiangyu5@huawei.com>2018-08-03 10:25:00 +0800
commitf4c24f851dbc454bacdf4e5318297f6f5247127f (patch)
treeb2f666308d8a8b5e31679d138839c8081535e1d6
parent6db274398147b194e178650139e44dba0b08ec34 (diff)
Add network_odl.yml for baremetal pod
JIRA: - 1. add network_odl.yml for huawei-pod1 and huawei-pod2 2. change br-provider to br-int for network_odl.yml Change-Id: Id116d8f67b99d05a7be913787873048a543b2e2c Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
-rw-r--r--deploy/conf/hardware_environment/huawei-pod1/network_odl.yml126
-rw-r--r--deploy/conf/hardware_environment/huawei-pod2/network_odl.yml126
-rw-r--r--deploy/conf/vm_environment/huawei-virtual1/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual2/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual3/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual4/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual5/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual7/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual8/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/huawei-virtual9/network_odl.yml2
-rw-r--r--deploy/conf/vm_environment/network_odl.yml2
11 files changed, 261 insertions, 9 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network_odl.yml b/deploy/conf/hardware_environment/huawei-pod1/network_odl.yml
new file mode 100644
index 00000000..266fd222
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod1/network_odl.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-int
+ network: physnet
+ interface: external-nic
+ type: ovs
+ role:
+ - controller
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth0
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
+ interface: eth1
+ type: normal
+ vlan_tag: 101
+ role:
+ - controller
+ - 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.168.10.10"
+ - "192.168.10.50"
+ cidr: "192.168.10.0/24"
+ gw: "192.168.10.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ ip: 192.168.10.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: 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"
diff --git a/deploy/conf/hardware_environment/huawei-pod2/network_odl.yml b/deploy/conf/hardware_environment/huawei-pod2/network_odl.yml
new file mode 100644
index 00000000..0941939a
--- /dev/null
+++ b/deploy/conf/hardware_environment/huawei-pod2/network_odl.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-int
+ network: physnet
+ interface: external-nic
+ type: ovs
+ role:
+ - controller
+
+sys_intf_mappings:
+ - name: mgmt
+ interface: eth0
+ type: normal
+ vlan_tag: None
+ role:
+ - controller
+ - compute
+
+ - name: tenant
+ interface: eth1
+ type: normal
+ vlan_tag: 101
+ role:
+ - controller
+ - 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.168.11.10"
+ - "192.168.11.50"
+ cidr: "192.168.11.0/24"
+ gw: "192.168.11.1"
+ role:
+ - controller
+ - compute
+
+internal_vip:
+ ip: 10.1.0.222
+ netmask: "24"
+ interface: mgmt
+
+public_vip:
+ 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: 10
+ 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.100"
+ floating_ip_end: "192.168.11.200"
diff --git a/deploy/conf/vm_environment/huawei-virtual1/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual1/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual1/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual1/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual2/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual2/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual2/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual2/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual3/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual3/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual3/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual3/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual4/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual4/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual4/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual4/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual5/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual5/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual5/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual5/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual7/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual7/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual7/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual7/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual8/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual8/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual8/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual8/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/huawei-virtual9/network_odl.yml b/deploy/conf/vm_environment/huawei-virtual9/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/huawei-virtual9/network_odl.yml
+++ b/deploy/conf/vm_environment/huawei-virtual9/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs
diff --git a/deploy/conf/vm_environment/network_odl.yml b/deploy/conf/vm_environment/network_odl.yml
index ac449846..017c6f6d 100644
--- a/deploy/conf/vm_environment/network_odl.yml
+++ b/deploy/conf/vm_environment/network_odl.yml
@@ -12,7 +12,7 @@ nic_mappings: []
bond_mappings: []
provider_net_mappings:
- - name: br-provider
+ - name: br-int
network: physnet
interface: external-nic
type: ovs