diff options
| author |   Michael Henkel <mhenkel@juniper.net> | 2017-06-16 11:02:59 -0700 |
|---|---|---|
| committer | Michael Henkel <mhenkel@juniper.net> | 2017-07-25 18:24:13 +0200 |
| commit | aa5194f878bb0c9fb98891abd6005b1b252eff3e (patch) | |
| tree | cff5a15d52a123e72c399ec293f29229adf80563 /puppet/services/network/contrail-neutron-plugin.yaml | |
| parent | ec25c792d73c4a4b6e14ddfa0ffa385211fa1a29 (diff) | |
Contrail network realignement + DPDK enablement
This patch moves Contrail roles communication from public/external
to internal_api network for OpenStack API.
It also adds the option to enable dpdk.
Monolithic firstboot script is broken down into small pre-network
and per-node extraconfig scripts
Change-Id: I296a3bf60cef6fa950fd71d6e68effe367d1e66b
Closes-Bug: 1698422
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 |