diff --git a/puppet/services/neutron-metadata.yaml b/puppet/services/neutron-metadata.yaml
index 30f34777d3..ace5112e6d 100644
--- a/puppet/services/neutron-metadata.yaml
+++ b/puppet/services/neutron-metadata.yaml
@@ -57,13 +57,23 @@ parameters:
     default:
       tag: openstack.neutron.agent.metadata
       path: /var/log/neutron/metadata-agent.log
+  Debug:
+    type: boolean
+    default: false
+    description: Set to True to enable debugging on all services.
+  NeutronMetadataAgentDebug:
+    default: ''
+    description: Set to True to enable debugging for Neutron Metadata agent.
+    type: string
+    constraints:
+      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
   EnableInternalTLS:
     type: boolean
     default: false
 
 conditions:
   neutron_workers_unset: {equals : [{get_param: NeutronWorkers}, '']}
-
+  service_debug_unset: {equals: [{get_param: NeutronMetadataAgentDebug}, '']}
   internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
 
 resources:
@@ -94,6 +104,11 @@ outputs:
             neutron::agents::metadata::auth_password: {get_param: NeutronPassword}
             neutron::agents::metadata::auth_url: { get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
             neutron::agents::metadata::auth_tenant: 'service'
+            neutron::agents::metadata::debug:
+                if:
+                - service_debug_unset
+                - {get_param: Debug}
+                - {get_param: NeutronMetadataAgentDebug}
             neutron::agents::metadata::metadata_ip: "%{hiera('nova_metadata_vip')}"
             neutron::agents::metadata::metadata_host:
               str_replace: