diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2017-07-26 11:21:46 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2017-07-26 11:21:47 +0000 |
| commit | 4c05db369cb44bc10fd3c6a131af5badcdfd351b (patch) | |
| tree | 14de607f4f417b135c373430ce09aa913eb3b8e2 /puppet/services/network/contrail-neutron-plugin.yaml | |
| parent | f1ff69d1a24414dc3da47b5e33e440210386d4dc (diff) | |
| parent | aa5194f878bb0c9fb98891abd6005b1b252eff3e (diff) | |
Merge "Contrail network realignement + DPDK enablement"
Diffstat (limited to 'puppet/services/network/contrail-neutron-plugin.yaml')
| -rw-r--r-- | puppet/services/network/contrail-neutron-plugin.yaml | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/puppet/services/network/contrail-neutron-plugin.yaml b/puppet/services/network/contrail-neutron-plugin.yaml index 95951fd5..50a6be48 100644 --- a/puppet/services/network/contrail-neutron-plugin.yaml +++ b/puppet/services/network/contrail-neutron-plugin.yaml @@ -33,7 +33,7 @@ parameters: ContrailExtensions: description: List of OpenContrail extensions to be enabled type: comma_delimited_list - default: '' + default: 'ipam:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_ipam.NeutronPluginContrailIpam,policy:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_policy.NeutronPluginContrailPolicy,route-table:neutron_plugin_contrail.plugins.opencontrail.contrail_plugin_vpc.NeutronPluginContrailVpc,contrail:None' resources: ContrailBase: @@ -54,7 +54,7 @@ outputs: config_settings: map_merge: - get_attr: [ContrailBase, role_data, config_settings] - - neutron::api_extensions_path: /usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions + - neutron::api_extensions_path: '/usr/lib/python2.7/site-packages/neutron_plugin_contrail/extensions:/usr/lib/python2.7/site-packages/neutron_lbaas/extensions' contrail::vrouter::contrail_extensions: {get_param: ContrailExtensions} step_config: | include tripleo::network::contrail::neutron_plugin |