Merge "Composable Plumgrid compute plugin"

3 files changed, 20 insertions, 15 deletions

diff --git a/environments/neutron-plumgrid.yaml b/environments/neutron-plumgrid.yaml
index 78e7d912..87946211 100755
--- a/environments/neutron-plumgrid.yaml
+++ b/environments/neutron-plumgrid.yaml
@@ -9,7 +9,7 @@ resource_registry:
   OS::TripleO::Services::ComputeNeutronOvsAgent: OS::Heat::None
   # Override the Neutron core plugin to use PLUMgrid
   OS::TripleO::Services::NeutronCorePlugin: OS::TripleO::Services::NeutronCorePluginPlumgrid
-  OS::TripleO::Services::ComputeNeutronCorePlugin: OS::Heat::None
+  OS::TripleO::Services::ComputeNeutronCorePlugin: ../puppet/services/neutron-compute-plugin-plumgrid.yaml
 
 parameter_defaults:
   NeutronCorePlugin: networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2
diff --git a/puppet/manifests/overcloud_compute.pp b/puppet/manifests/overcloud_compute.pp
index 6c74ee85..5d315a72 100644
--- a/puppet/manifests/overcloud_compute.pp
+++ b/puppet/manifests/overcloud_compute.pp
@@ -42,20 +42,6 @@ if hiera('step') >= 4 {
     #  require => Class['contrail::vrouter'],
     #}
   }
-  elsif hiera('neutron::core_plugin') == 'networking_plumgrid.neutron.plugins.plugin.NeutronPluginPLUMgridV2' {
-    # forward all ipv4 traffic
-    # this is required for the vms to pass through the gateways public interface
-    sysctl::value { 'net.ipv4.ip_forward': value => '1' }
-
-    # ifc_ctl_pp needs to be invoked by root as part of the vif.py when a VM is powered on
-    file { '/etc/sudoers.d/ifc_ctl_sudoers':
-      ensure  => file,
-      owner   => root,
-      group   => root,
-      mode    => '0440',
-      content => "nova ALL=(root) NOPASSWD: /opt/pg/bin/ifc_ctl_pp *\n",
-    }
-  }
 
   include ::ceilometer
   include ::ceilometer::config
diff --git a/puppet/services/neutron-compute-plugin-plumgrid.yaml b/puppet/services/neutron-compute-plugin-plumgrid.yaml
new file mode 100644
index 00000000..b8ec389e
--- /dev/null
+++ b/puppet/services/neutron-compute-plugin-plumgrid.yaml
@@ -0,0 +1,19 @@
+heat_template_version: 2016-04-08
+
+description: >
+  OpenStack Neutron Compute Plumgrid 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 Plumgrid plugin
+    value:
+      config_settings:
+      step_config: |
+        include tripleo::profile::base::neutron::plumgrid