summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCedric Ollivier <cedric.ollivier@orange.com>2020-03-10 09:23:48 +0000
committerGerrit Code Review <gerrit@opnfv.org>2020-03-10 09:23:48 +0000
commit6bebb81e477fd91ac75d078b3aa7ca9e97d2dde3 (patch)
tree49528cebe5638666a339671d003c0cf02d7660fa
parente9c7fa144c6e9e1126e5afe85b152e9f01029802 (diff)
parent3e37952aa5f19b531cb485c6e247d37ce349fa68 (diff)
Merge "Enable trunk in Neutron"
-rw-r--r--type/cntt/software/charts/osh/openstack-compute-kit/neutron-ovsdpdk.yaml3
-rw-r--r--type/cntt/software/charts/osh/openstack-compute-kit/neutron.yaml4
2 files changed, 7 insertions, 0 deletions
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
...