openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Composable OpenContrail compute plugin 

Adds a new neutron compute plugin used to help configure opencontrail
for use on compute nodes.

Change-Id: I67a649445d5f1cb21ab9483bae7f5f4c2c657142
This commit is contained in:
Dan Prince 2016-07-06 14:23:54 -04:00
parent 613e009d9f
commit b510cabb86
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
environments/neutron-opencontrail.yaml
View File

@ -9,7 +9,7 @@ resource_registry:
OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
# Override the NeutronCorePlugin to use Nuage
OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginOpencontrail
OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-opencontrail.yaml
parameter_defaults:
NeutronCorePlugin: neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2

10
puppet/manifests/overcloud_compute.pp
View File

@ -33,16 +33,6 @@ if hiera('step') >= 4 {
'DEFAULT/linuxnet_interface_driver': value => 'nova.network.linux_net.LinuxOVSInterfaceDriver';
}
if hiera('neutron::core_plugin') == 'neutron_plugin_contrail.plugins.opencontrail.contrail_plugin.NeutronPluginContrailCoreV2' {
include ::contrail::vrouter
# NOTE: it's not possible to use this class without a functional
# contrail controller up and running
#class {'::contrail::vrouter::provision_vrouter':
# require => Class['contrail::vrouter'],
#}
}
include ::ceilometer
include ::ceilometer::config
include ::ceilometer::agent::compute

19
puppet/services/neutron-compute-plugin-opencontrail.yaml Normal file
View File

@ -0,0 +1,19 @@
heat_template_version: 2016-04-08
description: >
OpenStack Neutron Compute OpenContrail plugin
parameters:
EndpointMap:
default: {}
description: Mapping of service endpoint -> protocol. Typically set
via parameter_defaults in the resource registry.
type: json
outputs:
role_data:
description: Role data for the Neutron Compute OpenContrail plugin
value:
config_settings:
step_config: |
include ::tripleo::profile::base::neutron::opencontrail::vrouter