From 193dc2117a1fb96d9fdd98258c1040775a33f033 Mon Sep 17 00:00:00 2001 From: chigang Date: Thu, 10 Aug 2017 10:40:11 +0800 Subject: Add dpdk plugin JIRA: COMPASS-550 add OVS-DPDK plugin, there are two roles in this plugin. 1. ins_dpdk is for dpdk installation and hugepages setting. 2. ins_ovs is for openvswitch installation. add dpdk scenario networking configuration example called "network_cfg_dpdk.yaml" Change-Id: Ifd8c1aadc218753f99bc26bb530e7cf9962ad8e3 Signed-off-by: chigang --- .../ansible/openstack/HA-ansible-multinodes.yml | 2 + deploy/conf/network_cfg_dpdk.yaml | 132 +++++++++++++++++++++ deploy/conf/vm_environment/os-nosdn-dpdk-ha.yml | 3 + deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml | 3 + 4 files changed, 140 insertions(+) create mode 100644 deploy/conf/network_cfg_dpdk.yaml (limited to 'deploy') diff --git a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml index e1efebfa..49f76cc7 100644 --- a/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml +++ b/deploy/adapters/ansible/openstack/HA-ansible-multinodes.yml @@ -23,6 +23,8 @@ - config-compute - storage - rt_kvm + - ins_dpdk + - ins_ovs - hosts: all remote_user: root diff --git a/deploy/conf/network_cfg_dpdk.yaml b/deploy/conf/network_cfg_dpdk.yaml new file mode 100644 index 00000000..e196d6f4 --- /dev/null +++ b/deploy/conf/network_cfg_dpdk.yaml @@ -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-dpdk-ha.yml index d098afba..3cd05faf 100644 --- a/deploy/conf/vm_environment/os-nosdn-dpdk-ha.yml +++ b/deploy/conf/vm_environment/os-nosdn-dpdk-ha.yml @@ -11,6 +11,9 @@ TYPE: virtual FLAVOR: cluster +plugins: + - dpdk: "Enable" + hosts: - name: host1 roles: diff --git a/deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml b/deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml index be1d9510..9fc2ca3f 100644 --- a/deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml +++ b/deploy/conf/vm_environment/os-nosdn-dpdk-noha.yml @@ -11,6 +11,9 @@ TYPE: virtual FLAVOR: cluster +plugins: + - dpdk: "Enable" + hosts: - name: host1 roles: -- cgit 1.2.3-korg