diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2016-10-14 23:21:33 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2016-10-14 23:21:33 +0000 |
| commit | b8d23becd1b96ebba0e1e113e9f5a2e80ae1a1a6 (patch) | |
| tree | 905d52a3db9fad0eccf8c0f810aad0c9dc32b5d0 | |
| parent | 30ebec7461cdbbf16e63c81df0aa17b96af69815 (diff) | |
| parent | 7b047949b417d89b54453f214b7d238d67e3e4c6 (diff) | |
Merge "Move trunk service plugin to the proper list"
| -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 |