From: Yifei Xue <xueyifei@huawei.com>
Date: Sat, 27 Jan 2018 03:41:04 +0000 (+0800)
Subject: Enable neutron port trunk
X-Git-Tag: opnfv-6.0.0~51
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F23%2F51223%2F1;p=compass4nfv.git

Enable neutron port trunk

JIRA: COMPASS-571

The network trunk service allows multiple networks to be connected to an
instance using a single virtual NIC (vNIC). Multiple networks can be presented
to an instance by connecting it to a single port. This is a highly relevant
feature for VNFs and hence for OPNFV as a reference NFVI.

This patch is about enabling the trunk port feature in Compass deployments.

Change-Id: I270c3f1d5e4af99578c8e1882fae12ddddaabe78
Signed-off-by: Yifei Xue <xueyifei@huawei.com>
---

diff --git a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2 b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
index 130b5ad1..03e3a2af 100644
--- a/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
+++ b/deploy/adapters/ansible/roles/config-osa/templates/user_variables.yml.j2
@@ -45,6 +45,11 @@ neutron_plugin_type: ml2.ovs
 
 neutron_ml2_drivers_type: "local,flat,{{ tenant_net_info['type'] }}"
 
+neutron_plugin_base:
+  - router
+  - metering
+  - trunk
+
 neutron_provider_networks:
   network_flat_networks: "*"
   network_types: "{{ tenant_net_info['type'] }}"