Merge "Allow quantum core plugin to be passed through."

manifests/controller.pp

@@ -146,6 +146,7 @@ class openstack::controller (
   # optional. Not sure what to do about this.
   $quantum_user_password   = false,
   $quantum_db_password     = false,
+  $quantum_core_plugin     = undef,
   $cinder_user_password    = false,
   $cinder_db_password      = false,
   $swift_user_password     = false,
@@ -450,6 +451,8 @@ class openstack::controller (
       db_name               => $quantum_db_name,
       db_user               => $quantum_db_user,
       db_password           => $quantum_db_password,
+      # Plugin
+      core_plugin           => $quantum_core_plugin,
       # Quantum agents
       enable_dhcp_agent     => $enable_dhcp_agent,
       enable_l3_agent       => $enable_l3_agent,

manifests/quantum.pp

@@ -189,6 +189,8 @@ class openstack::quantum (
   $db_name                = 'quantum',
   $db_user                = 'quantum',
   $sql_idle_timeout       = '3600',
+  # Plugin
+  $core_plugin            = undef,
   # General
   $bind_address           = '0.0.0.0',
   $keystone_host          = '127.0.0.1',
@@ -198,6 +200,7 @@ class openstack::quantum (
 
   class { '::quantum':
     enabled             => $enabled,
+    core_plugin         => $core_plugin,
     bind_host           => $bind_address,
     rabbit_host         => $rabbit_host,
     rabbit_hosts        => $rabbit_hosts,