Merge "Revert "Disable systemd-networkd & systemd-resolved""

[apex-tripleo-heat-templates.git] / puppet / services / neutron-base.yaml

diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml
index 764d548..b955689 100644 (file)
--- a/puppet/services/neutron-base.yaml
+++ b/puppet/services/neutron-base.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike

 
 description: >
   OpenStack Neutron base service. Shared for all Neutron agents.
 
 description: >
   OpenStack Neutron base service. Shared for all Neutron agents.


@@ -50,6 +50,10 @@ parameters:
     type: string
     default: ''
     description: Set to True to enable debugging on all services.
     type: string
     default: ''
     description: Set to True to enable debugging on all services.

+  NeutronDebug:
+    default: ''
+    description: Set to True to enable debugging Neutron services.
+    type: string

   EnableConfigPurge:
     type: boolean
     default: false
   EnableConfigPurge:
     type: boolean
     default: false


@@ -65,6 +69,10 @@ parameters:
         networks, neutron uses this value without modification. For overlay
         networks such as VXLAN, neutron automatically subtracts the overlay
         protocol overhead from this value.
         networks, neutron uses this value without modification. For overlay
         networks such as VXLAN, neutron automatically subtracts the overlay
         protocol overhead from this value.

+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json

   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set


@@ -87,9 +95,16 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json

+  NotificationDriver:
+    type: string
+    default: 'messagingv2'
+    description: Driver or drivers to handle sending notifications.
+    constraints:
+      - allowed_values: [ 'messagingv2', 'noop' ]

 
 conditions:
   dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
 
 conditions:
   dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}

+  service_debug_unset: {equals : [{get_param: NeutronDebug}, '']}

 
 outputs:
   role_data:
 
 outputs:
   role_data:


@@ -102,9 +117,14 @@ outputs:
             neutron::rabbit_user: {get_param: RabbitUserName}
             neutron::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
             neutron::rabbit_port: {get_param: RabbitClientPort}
             neutron::rabbit_user: {get_param: RabbitUserName}
             neutron::rabbit_use_ssl: {get_param: RabbitClientUseSSL}
             neutron::rabbit_port: {get_param: RabbitClientPort}

+            neutron::notification_driver: {get_param: NotificationDriver}

             neutron::core_plugin: {get_param: NeutronCorePlugin}
             neutron::service_plugins: {get_param: NeutronServicePlugins}
             neutron::core_plugin: {get_param: NeutronCorePlugin}
             neutron::service_plugins: {get_param: NeutronServicePlugins}

-            neutron::debug: {get_param: Debug}
+            neutron::debug:
+              if:
+              - service_debug_unset
+              - {get_param: Debug }
+              - {get_param: NeutronDebug }

             neutron::purge_config: {get_param: EnableConfigPurge}
             neutron::allow_overlapping_ips: true
             neutron::dns_domain: {get_param: NeutronDnsDomain}
             neutron::purge_config: {get_param: EnableConfigPurge}
             neutron::allow_overlapping_ips: true
             neutron::dns_domain: {get_param: NeutronDnsDomain}