diff options
| author |   Brent Eagles <beagles@redhat.com> | 2016-10-13 10:55:55 -0230 |
|---|---|---|
| committer | Brent Eagles <beagles@redhat.com> | 2016-10-13 10:55:55 -0230 |
| commit | 7b047949b417d89b54453f214b7d238d67e3e4c6 (patch) | |
| tree | eb45b96c538362847c032f7cd03feca0c3eec6ea | |
| parent | 6d72ac41c0a71a38c0f7d1b6decaac65c1d62ae2 (diff) | |
Move trunk service plugin to the proper list
The trunk plugin required for trunk port support in neutron was added to
the incorrect plugin list.
Change-Id: I8d424d6a6045e07d9fbab1a864470ceefdb1ad8e
Closes-Bug: #1633079
| -rw-r--r-- | puppet/services/neutron-base.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/neutron-plugin-ml2.yaml | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index 32d50d41..6bb4ba08 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -33,7 +33,7 @@ parameters: from neutron.core_plugins namespace. type: string NeutronServicePlugins: - default: "router,qos" + default: "router,qos,trunk" description: | Comma-separated list of service plugin entrypoints to be loaded from the neutron.service_plugins namespace. diff --git a/puppet/services/neutron-plugin-ml2.yaml b/puppet/services/neutron-plugin-ml2.yaml index 17e8bca1..5dbae3dc 100644 --- a/puppet/services/neutron-plugin-ml2.yaml +++ b/puppet/services/neutron-plugin-ml2.yaml @@ -33,7 +33,7 @@ parameters: default: 'datacentre' description: If set, flat networks to configure in neutron plugins. NeutronPluginExtensions: - default: "qos,port_security,trunk" + default: "qos,port_security" description: | Comma-separated list of extensions enabled for the Neutron plugin. type: comma_delimited_list |