diff options
| author |   Feng Pan <fpan@redhat.com> | 2017-02-22 14:44:39 -0500 |
|---|---|---|
| committer |   Tim Rozet <trozet@redhat.com> | 2017-03-12 22:43:53 -0400 |
| commit | 78a9d70f7f6a5b0b0f941c849a9250da2181c428 (patch) | |
| tree | d9256a30c6b973ded974a22b38c19d78f6761078 /config | |
| parent | 05954847525a0eab9db88ab6f327fb960e1fbd03 (diff) | |
Add support for odl_l3-fdio
This patch adds support for ODL L3 FDIO scenario.
Introduces a new deploy settings parameter, odl_routing_node, to
indicate the routing node's hostname. This parameter will only
be used for this scenario.
Change-Id: I8df3eb701299007761c6cec42c4ca318b124a0b8
opnfv-tht-pr: 108
os-net-config-pr: 4
Signed-off-by: Feng Pan <fpan@redhat.com>
(cherry picked from commit 7d994a3c3e18227c26bf58049e4d5780144ecf98)
Diffstat (limited to 'config')
| -rw-r--r-- | config/deploy/os-odl_l3-fdio-ha.yaml | 37 | ||||
| -rw-r--r-- | config/deploy/os-odl_l3-fdio-noha.yaml | 37 | ||||
| -rw-r--r-- | config/network/network_settings_vpp.yaml | 6 |
3 files changed, 76 insertions, 4 deletions
diff --git a/config/deploy/os-odl_l3-fdio-ha.yaml b/config/deploy/os-odl_l3-fdio-ha.yaml new file mode 100644 index 00000000..af81e5a5 --- /dev/null +++ b/config/deploy/os-odl_l3-fdio-ha.yaml @@ -0,0 +1,37 @@ +global_params: + ha_enabled: true + +deploy_options: + sdn_controller: opendaylight + sdn_l3: true + odl_version: carbon + odl_vpp_routing_node: overcloud-novacompute-0 + tacker: true + congress: true + sfc: false + vpn: false + vpp: true + dataplane: fdio + performance: + Controller: + kernel: + hugepages: 1024 + hugepagesz: 2M + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic diff --git a/config/deploy/os-odl_l3-fdio-noha.yaml b/config/deploy/os-odl_l3-fdio-noha.yaml new file mode 100644 index 00000000..adb37f3d --- /dev/null +++ b/config/deploy/os-odl_l3-fdio-noha.yaml @@ -0,0 +1,37 @@ +global_params: + ha_enabled: false + +deploy_options: + sdn_controller: opendaylight + sdn_l3: true + odl_version: carbon + odl_vpp_routing_node: overcloud-novacompute-0 + tacker: true + congress: true + sfc: false + vpn: false + vpp: true + dataplane: fdio + performance: + Controller: + kernel: + hugepages: 1024 + hugepagesz: 2M + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic + Compute: + kernel: + hugepagesz: 2M + hugepages: 2048 + intel_iommu: 'on' + iommu: pt + isolcpus: 1,2 + vpp: + main-core: 1 + corelist-workers: 2 + uio-driver: uio_pci_generic diff --git a/config/network/network_settings_vpp.yaml b/config/network/network_settings_vpp.yaml index 4b50745f..c6792157 100644 --- a/config/network/network_settings_vpp.yaml +++ b/config/network/network_settings_vpp.yaml @@ -96,14 +96,12 @@ networks: # Network configurations # vlan, vxlan, gre nic_mapping: # Mapping of network configuration for Overcloud Nodes compute: # Mapping for compute profile (nodes that will be used as Compute nodes) - phys_type: vpp_interface # Physical interface type (interface/vpp_interface) - uio_driver: uio_pci_generic # uio driver, for vpp interfaces only + phys_type: interface # Physical interface type (interface/bond) vlan: native # VLAN tag to use with this NIC members: # Physical NIC members of this mapping (Single value allowed for interface phys_type) - eth1 # Note that logic nic name like nic1 cannot be used for fdio deployment yet. controller: # Mapping for controller profile (nodes that will be used as Controller nodes) - phys_type: vpp_interface # Physical interface type (interface/vpp_interface) - uio_driver: uio_pci_generic # uio driver, for vpp interfaces only + phys_type: interface # Physical interface type (interface/bond) vlan: native members: - eth1 # Note that logic nic name like nic1 cannot be used for fdio deployment yet. |