From: James Gu <james.gu@att.com>
Date: Thu, 5 Mar 2020 00:14:59 +0000 (-0800)
Subject: Enable trunk in Neutron
X-Git-Tag: opnfv-10.0.0~24^2
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F54%2F69754%2F1;p=airship.git

Enable trunk in Neutron

Enabled trunk service in Neutron by default

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: Ibff5494ce9d7eef2323794da33712e61c46a3e10
---

diff --git a/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml b/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml
index 12e06f2..6c2d228 100644
--- a/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml
+++ b/type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml
@@ -169,6 +169,9 @@ data:
                 vf_index: 0
               - name: dpdk_b0s1
                 vf_index: 0
+      neutron:
+        DEFAULT:
+          service_plugins: router,trunk
       plugins:
         openvswitch_agent:
           default:
diff --git a/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml b/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml
index d220fcb..b6b8f7d 100644
--- a/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml
+++ b/type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml
@@ -19,4 +19,8 @@ data:
     pod:
       replicas:
         server: 9
+    conf:
+      neutron:
+        DEFAULT:
+          service_plugins: router,trunk
 ...