From dea033bca6997bff226391bf10c5afebcfd4dd18 Mon Sep 17 00:00:00 2001
From: Dan Prince <dprince@redhat.com>
Date: Wed, 8 Jun 2016 15:51:18 -0400
Subject: Move Neutron core and service plugin to base

Move the settings/parameters for the neutron core plugin and
neutron service plugins into the base role.

Partially-implements: blueprint composable-services-within-roles

Change-Id: Ieb307fa7bc5ecfbc500787e3f292488476f7d850
---
 puppet/controller.yaml            | 20 --------------------
 puppet/services/neutron-base.yaml | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 20 deletions(-)

(limited to 'puppet')

diff --git a/puppet/controller.yaml b/puppet/controller.yaml
index 66a5d5e5..cb8c5bc3 100644
--- a/puppet/controller.yaml
+++ b/puppet/controller.yaml
@@ -251,18 +251,6 @@ parameters:
     description: Shared secret to prevent spoofing
     type: string
     hidden: true
-  NeutronCorePlugin:
-    default: 'ml2'
-    description: |
-        The core plugin for Neutron. The value should be the entrypoint to be loaded
-        from neutron.core_plugins namespace.
-    type: string
-  NeutronServicePlugins:
-    default: "router,qos"
-    description: |
-        Comma-separated list of service plugin entrypoints to be loaded from the
-        neutron.service_plugins namespace.
-    type: comma_delimited_list
   NeutronPassword:
     description: The password for the neutron service and db account, used by neutron agents.
     type: string
@@ -674,12 +662,6 @@ resources:
             params:
               CLUSTER: {get_param: MysqlClusterUniquePart}
         neutron_metadata_proxy_shared_secret: {get_param: NeutronMetadataProxySharedSecret}
-        neutron_core_plugin: {get_param: NeutronCorePlugin}
-        neutron_service_plugins:
-          str_replace:
-            template: PLUGINS
-            params:
-              PLUGINS: {get_param: NeutronServicePlugins}
         neutron_password: {get_param: NeutronPassword}
         neutron_tenant_mtu: {get_param: NeutronTenantMtu}
         neutron_internal_url: { get_param: [ EndpointMap, NeutronInternal, uri ] }
@@ -958,8 +940,6 @@ resources:
                 neutron::network_device_mtu: {get_input: neutron_tenant_mtu}
                 neutron::agents::ml2::ovs::local_ip: {get_input: neutron_local_ip}
                 neutron::agents::metadata::metadata_ip: {get_input: neutron_api_network}
-                neutron::core_plugin: {get_input: neutron_core_plugin}
-                neutron::service_plugins: {get_input: neutron_service_plugins}
                 neutron::keystone::auth::public_url: {get_input: neutron_public_url }
                 neutron::keystone::auth::internal_url: {get_input: neutron_internal_url }
                 neutron::keystone::auth::admin_url: {get_input: neutron_admin_url }
diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index b34bdd22..8bd8d989 100644
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -26,6 +26,18 @@ parameters:
     type: number
     default: 3
     description: The number of neutron dhcp agents to schedule per network
+  NeutronCorePlugin:
+    default: 'ml2'
+    description: |
+        The core plugin for Neutron. The value should be the entrypoint to be loaded
+        from neutron.core_plugins namespace.
+    type: string
+  NeutronServicePlugins:
+    default: "router,qos"
+    description: |
+        Comma-separated list of service plugin entrypoints to be loaded from the
+        neutron.service_plugins namespace.
+    type: comma_delimited_list
   Debug:
     type: string
     default: ''
@@ -41,4 +53,10 @@ outputs:
         neutron::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
         neutron::rabbit_port: {get_param: RabbitClientPort}
         neutron::dhcp_agents_per_network: {get_param: NeutronDhcpAgentsPerNetwork}
+        neutron::core_plugin: {get_param: NeutronCorePlugin}
+        neutron::service_plugins:
+          str_replace:
+            template: PLUGINS
+            params:
+              PLUGINS: {get_param: NeutronServicePlugins}
         neutron::debug: {get_param: Debug}
-- 
cgit 1.2.3-korg