diff options
| author |   Harry Huang <huangxiangyu5@huawei.com> | 2017-08-23 15:05:02 +0800 |
|---|---|---|
| committer | Harry Huang <huangxiangyu5@huawei.com> | 2017-09-01 16:31:01 +0800 |
| commit | 3bc3a8828c3ceefedd08e1767ae6e3bf2df9ac22 (patch) | |
| tree | 7413e99b2d9ddbadc782a5e9f68a6f1ba35570b1 /deploy/conf | |
| parent | 292985dab007c3ee1c3481c985871a3483d9f7bc (diff) | |
Support multiple physnet mapping
JIRA: COMPASS-559
1. support multiple mapping in provider_net_mappings
of network.yml and create corresponding ovs bridges
2. support seperate config in sys_intf_mappings
of network.yml
3. remove linux bridges in compute nodes for ovs
port binding convenience
4. support openstack vlan tenant network
5. modify odl and odl_sfc roles to use configurable
provider mapping
6. remove some hard coding
Change-Id: Ib57484ce60d029f89c647fd5baf2c7af37c85d0b
Signed-off-by: Harry Huang <huangxiangyu5@huawei.com>
Diffstat (limited to 'deploy/conf')
6 files changed, 60 insertions, 12 deletions
diff --git a/deploy/conf/hardware_environment/huawei-pod1/network.yml b/deploy/conf/hardware_environment/huawei-pod1/network.yml index 8c45ed96..77160d69 100644 --- a/deploy/conf/hardware_environment/huawei-pod1/network.yml +++ b/deploy/conf/hardware_environment/huawei-pod1/network.yml @@ -14,15 +14,15 @@ bond_mappings: [] provider_net_mappings: - 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 @@ -30,6 +30,7 @@ sys_intf_mappings: - name: tenant interface: eth1 + type: normal vlan_tag: 101 role: - controller @@ -37,6 +38,7 @@ sys_intf_mappings: - name: storage interface: eth1 + type: normal vlan_tag: 102 role: - controller @@ -44,6 +46,7 @@ sys_intf_mappings: - name: external interface: eth1 + type: normal vlan_tag: None role: - controller @@ -102,6 +105,11 @@ public_vip: interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net diff --git a/deploy/conf/vm_environment/huawei-virtual1/network.yml b/deploy/conf/vm_environment/huawei-virtual1/network.yml index 924a4ea4..4359202e 100644 --- a/deploy/conf/vm_environment/huawei-virtual1/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual1/network.yml @@ -14,15 +14,15 @@ bond_mappings: [] provider_net_mappings: - 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 @@ -30,6 +30,7 @@ sys_intf_mappings: - name: tenant interface: eth1 + type: normal vlan_tag: 101 role: - controller @@ -37,6 +38,7 @@ sys_intf_mappings: - name: storage interface: eth1 + type: normal vlan_tag: 102 role: - controller @@ -44,6 +46,7 @@ sys_intf_mappings: - name: external interface: eth1 + type: normal vlan_tag: None role: - controller @@ -102,6 +105,11 @@ public_vip: interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net diff --git a/deploy/conf/vm_environment/huawei-virtual2/network.yml b/deploy/conf/vm_environment/huawei-virtual2/network.yml index 924a4ea4..4359202e 100644 --- a/deploy/conf/vm_environment/huawei-virtual2/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual2/network.yml @@ -14,15 +14,15 @@ bond_mappings: [] provider_net_mappings: - 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 @@ -30,6 +30,7 @@ sys_intf_mappings: - name: tenant interface: eth1 + type: normal vlan_tag: 101 role: - controller @@ -37,6 +38,7 @@ sys_intf_mappings: - name: storage interface: eth1 + type: normal vlan_tag: 102 role: - controller @@ -44,6 +46,7 @@ sys_intf_mappings: - name: external interface: eth1 + type: normal vlan_tag: None role: - controller @@ -102,6 +105,11 @@ public_vip: interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net diff --git a/deploy/conf/vm_environment/huawei-virtual8/network.yml b/deploy/conf/vm_environment/huawei-virtual8/network.yml index 924a4ea4..4359202e 100644 --- a/deploy/conf/vm_environment/huawei-virtual8/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual8/network.yml @@ -14,15 +14,15 @@ bond_mappings: [] provider_net_mappings: - 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 @@ -30,6 +30,7 @@ sys_intf_mappings: - name: tenant interface: eth1 + type: normal vlan_tag: 101 role: - controller @@ -37,6 +38,7 @@ sys_intf_mappings: - name: storage interface: eth1 + type: normal vlan_tag: 102 role: - controller @@ -44,6 +46,7 @@ sys_intf_mappings: - name: external interface: eth1 + type: normal vlan_tag: None role: - controller @@ -102,6 +105,11 @@ public_vip: interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net diff --git a/deploy/conf/vm_environment/huawei-virtual9/network.yml b/deploy/conf/vm_environment/huawei-virtual9/network.yml index 924a4ea4..4359202e 100644 --- a/deploy/conf/vm_environment/huawei-virtual9/network.yml +++ b/deploy/conf/vm_environment/huawei-virtual9/network.yml @@ -14,15 +14,15 @@ bond_mappings: [] provider_net_mappings: - 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 @@ -30,6 +30,7 @@ sys_intf_mappings: - name: tenant interface: eth1 + type: normal vlan_tag: 101 role: - controller @@ -37,6 +38,7 @@ sys_intf_mappings: - name: storage interface: eth1 + type: normal vlan_tag: 102 role: - controller @@ -44,6 +46,7 @@ sys_intf_mappings: - name: external interface: eth1 + type: normal vlan_tag: None role: - controller @@ -102,6 +105,11 @@ public_vip: interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net diff --git a/deploy/conf/vm_environment/network.yml b/deploy/conf/vm_environment/network.yml index 924a4ea4..4359202e 100644 --- a/deploy/conf/vm_environment/network.yml +++ b/deploy/conf/vm_environment/network.yml @@ -14,15 +14,15 @@ bond_mappings: [] provider_net_mappings: - 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 @@ -30,6 +30,7 @@ sys_intf_mappings: - name: tenant interface: eth1 + type: normal vlan_tag: 101 role: - controller @@ -37,6 +38,7 @@ sys_intf_mappings: - name: storage interface: eth1 + type: normal vlan_tag: 102 role: - controller @@ -44,6 +46,7 @@ sys_intf_mappings: - name: external interface: eth1 + type: normal vlan_tag: None role: - controller @@ -102,6 +105,11 @@ public_vip: interface: external onos_nic: eth2 +tenant_net_info: + type: vxlan + range: "1:1000" + provider_network: None + public_net_info: enable: "True" network: ext-net |