Composable OpenContrail compute plugin

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

Change-Id: I67a649445d5f1cb21ab9483bae7f5f4c2c657142

diff --git a/environments/neutron-opencontrail.yaml b/environments/neutron-opencontrail.yaml
index d9d234b..4895287 100644 (file)
--- a/environments/neutron-opencontrail.yaml
+++ b/environments/neutron-opencontrail.yaml
@@ -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

diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 5d315a7..1a86b38 100644 (file)
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -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

diff --git a/puppet/services/neutron-compute-plugin-opencontrail.yaml b/puppet/services/neutron-compute-plugin-opencontrail.yaml
new file mode 100644 (file)
index 0000000..2c79c56
--- /dev/null
+++ b/puppet/services/neutron-compute-plugin-opencontrail.yaml
@@ -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