Merge "Add debug to neutron agents"

puppet/services/neutron-dhcp.yaml

@@ -14,6 +14,10 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  Debug:
+    type: boolean
+    default: false
+    description: Set to True to enable debugging on all services.
   DefaultPasswords:
     default: {}
     type: json
@@ -46,6 +50,12 @@ parameters:
   MonitoringSubscriptionNeutronDhcp:
     default: 'overcloud-neutron-dhcp'
     type: string
+  NeutronDhcpAgentDebug:
+    default: ''
+    description: Set to True to enable debugging for Neutron DHCP agent.
+    type: string
+    constraints:
+      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
   NeutronDhcpAgentLoggingSource:
     type: json
     default:
@@ -60,6 +70,9 @@ parameters:
     description: Neutron DHCP Agent interface driver
     type: string
 
+conditions:
+  service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']}
+
 resources:
 
   NeutronBase:
@@ -89,6 +102,11 @@ outputs:
             neutron::agents::dhcp::enable_metadata_network: {get_param: NeutronEnableMetadataNetwork}
             neutron::agents::dhcp::dnsmasq_dns_servers: {get_param: NeutronDhcpAgentDnsmasqDnsServers}
             neutron::agents::dhcp::interface_driver: {get_param: NeutronInterfaceDriver}
+            neutron::agents::dhcp::debug:
+              if:
+              - service_debug_unset
+              - {get_param: Debug}
+              - {get_param: NeutronDhcpAgentDebug}
             tripleo.neutron_dhcp.firewall_rules:
               '115 neutron dhcp input':
                 proto: 'udp'

puppet/services/neutron-l2gw-agent.yaml

@@ -13,6 +13,10 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  Debug:
+    type: boolean
+    default: false
+    description: Set to True to enable debugging on all services.
   DefaultPasswords:
     default: {}
     type: json
@@ -57,6 +61,12 @@ parameters:
   MonitoringSubscriptionNeutronL2gwAgent:
     default: 'overcloud-neutron-l2gw-agent'
     type: string
+  NeutronL2gwAgentDebug:
+    default: ''
+    description: Set to True to enable debugging for Neutron L2gw agent.
+    type: string
+    constraints:
+      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
   NeutronL2gwAgentLoggingSource:
     type: json
     default:
@@ -64,6 +74,7 @@ parameters:
       path: /var/log/neutron/l2gw-agent.log
 
 conditions:
+  service_debug_unset: {equals: [{get_param: NeutronL2gwAgentDebug}, '']}
   internal_manager_enabled: {equals: [{get_param: L2gwAgentEnableManager}, True]}
 
 outputs:
@@ -83,6 +94,11 @@ outputs:
             neutron::agents::l2gw::periodic_interval: {get_param: L2gwAgentPeriodicInterval}
             neutron::agents::l2gw::max_connection_retries: {get_param: L2gwAgentMaxConnectionRetries}
             neutron::agents::l2gw::socket_timeout: {get_param: L2gwAgentSocketTimeout}
+            neutron::agents::l2gw::debug:
+              if:
+              - service_debug_unset
+              - {get_param: Debug}
+              - {get_param: NeutronL2gwAgentDebug}
           -
             if:
               - internal_manager_enabled

puppet/services/neutron-l3.yaml

@@ -14,6 +14,10 @@ parameters:
                  via parameter_defaults in the resource registry.  This
                  mapping overrides those in ServiceNetMapDefaults.
     type: json
+  Debug:
+    type: boolean
+    default: false
+    description: Set to True to enable debugging on all services.
   DefaultPasswords:
     default: {}
     type: json
@@ -30,10 +34,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  Debug:
-    type: boolean
-    default: false
-    description: Set to True to enable debugging on all services.
   NeutronL3AgentMode:
     description: |
       Agent mode for L3 agent. Must be one of legacy or dvr_snat.
@@ -46,6 +46,12 @@ parameters:
   MonitoringSubscriptionNeutronL3:
     default: 'overcloud-neutron-l3-agent'
     type: string
+  NeutronL3AgentDebug:
+    default: ''
+    description: Set to True to enable debugging for Neutron L3 agent.
+    type: string
+    constraints:
+      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
   NeutronL3AgentLoggingSource:
     type: json
     default:
@@ -62,7 +68,7 @@ parameters:
     default: ''
 
 conditions:
-
+  service_debug_unset: {equals: [{get_param: NeutronL3AgentDebug}, '']}
   external_network_bridge_empty: {equals : [{get_param: NeutronExternalNetworkBridge}, "''"]}
 
 resources:
@@ -90,6 +96,11 @@ outputs:
         map_merge:
         - get_attr: [NeutronBase, role_data, config_settings]
         - neutron::agents::l3::agent_mode: {get_param: NeutronL3AgentMode}
+          neutron::agents::l3::debug:
+            if:
+            - service_debug_unset
+            - {get_param: Debug}
+            - {get_param: NeutronL3AgentDebug}
           tripleo.neutron_l3.firewall_rules:
             '106 neutron_l3 vrrp':
               proto: vrrp