Change all *Debug parameter types to boolean

This changes all these parameters as heat would correctly parse all values. Also, drops all yaql shenanigans used for their handling and heat conditions. Also fixes wrong usage of non-existent NeutronWrapperDebug parameter in ovn-metadata-container-puppet.yaml. We had converted all ``Debug`` parameters to boolean with Ib6c3969d4dd75d5fb2cc274266c060acff8d5571. Change-Id: Ia2bffffde34aa248a4cc60c3895464f1f9d1ded2
2021-03-19 11:50:48 +05:30 · 2021-03-19 11:50:48 +05:30 · b4203a30eb
commit b4203a30eb
parent aa601a280f
26 changed files with 134 additions and 219 deletions
--- a/deployment/aodh/aodh-base.yaml
+++ b/deployment/aodh/aodh-base.yaml
@ -40,11 +40,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  AodhDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Aodh services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -60,7 +58,6 @@ parameters:
    description: Driver or drivers to handle sending notifications.

 conditions:
-  service_debug_unset: {equals : [{get_param: AodhDebug}, '']}
  enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}

 outputs:
@ -92,9 +89,9 @@ outputs:

        aodh::logging::debug:
          if:
-          - service_debug_unset
-          - {get_param: Debug }
-          - {get_param: AodhDebug }
+          - {get_param: AodhDebug}
+          - true
+          - {get_param: Debug}
        aodh::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
        aodh::notification_driver: {get_param: NotificationDriver}
        aodh::keystone::authtoken::project_name: 'service'
--- a/deployment/barbican/barbican-api-container-puppet.yaml
+++ b/deployment/barbican/barbican-api-container-puppet.yaml
@ -135,11 +135,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  BarbicanDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Barbican service.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  KeystoneRegion:
    type: string
    default: 'regionOne'
@ -165,7 +163,6 @@ parameters:
      perform configuration on a Heat stack-update.

 conditions:
-  service_debug_unset:  {equals : [{get_param: BarbicanDebug}, '']}
  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
  thales_hsm_enabled:   {equals: [{get_param: BarbicanPkcs11CryptoThalesEnabled}, true]}
  atos_hsm_enabled:     {equals: [{get_param: BarbicanPkcs11CryptoATOSEnabled}, true]}
@ -253,9 +250,9 @@ outputs:
            barbican::api::enable_queue: true
            barbican::api::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
-              - {get_param: BarbicanDebug }
+              - {get_param: BarbicanDebug}
+              - true
+              - {get_param: Debug}
            barbican::api::notification_driver: {get_param: NotificationDriver}
            barbican::api::service_name: 'httpd'
            barbican::wsgi::apache::bind_host:
--- a/deployment/ceilometer/ceilometer-base-container-puppet.yaml
+++ b/deployment/ceilometer/ceilometer-base-container-puppet.yaml
@ -52,11 +52,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  CeilometerDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Ceilometer services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  KeystoneRegion:
    type: string
    default: 'regionOne'
@ -97,7 +95,6 @@ parameter_groups:
  - GnocchiArchivePolicy

 conditions:
-  service_debug_unset: {equals : [{get_param: CeilometerDebug}, '']}
  ceilometer_qdr_publish: {equals: [{get_param: CeilometerQdrPublish}, true]}

 outputs:
@ -109,9 +106,9 @@ outputs:
        map_merge:
          - ceilometer::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
              - {get_param: CeilometerDebug }
+              - true
+              - {get_param: Debug }
            ceilometer::agent::auth::auth_password: {get_param: CeilometerPassword}
            ceilometer::agent::auth::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix] }
            ceilometer::agent::polling::manage_polling: {get_param: ManagePolling}
--- a/deployment/cinder/cinder-base.yaml
+++ b/deployment/cinder/cinder-base.yaml
@ -17,11 +17,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  CinderDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging on Cinder services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -109,7 +107,6 @@ parameters:
    hidden: true

 conditions:
-  service_debug_unset: {equals : [{get_param: CinderDebug}, '']}
  enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}

 outputs:
@ -140,9 +137,9 @@ outputs:

        cinder::logging::debug:
          if:
-          - service_debug_unset
-          - {get_param: Debug }
-          - {get_param: CinderDebug }
+          - {get_param: CinderDebug}
+          - true
+          - {get_param: Debug}
        cinder::storage_availability_zone: {get_param: CinderStorageAvailabilityZone}
        cinder::rabbit_heartbeat_timeout_threshold: 60
        cinder::rpc_response_timeout: {get_param: CinderRpcResponseTimeout}
--- a/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
+++ b/deployment/container-image-prepare/container-image-prepare-baremetal-ansible.j2.yaml
@ -59,11 +59,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  ContainerImagePrepareDebug:
-    default: ''
+    default: false
    description: Whether or not we want to activate --debug in tripleo container image prepare.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  ContainerImageRegistryCredentials:
    type: json
    hidden: true
@ -94,10 +92,6 @@ parameters:
    default: {{role.CountDefault|default(0)}}
 {% endfor %}

-conditions:
-
-  service_debug_unset: {equals : [{get_param: ContainerImagePrepareDebug}, '']}
-
 outputs:
  role_data:
    description: Role data for container image prepare
@ -111,9 +105,9 @@ outputs:
            tripleo_container_image_prepare_log_file: {get_param: ContainerImagePrepareLogFile}
            tripleo_container_image_prepare_debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
-              - {get_param: ContainerImagePrepareDebug }
+              - {get_param: ContainerImagePrepareDebug}
+              - true
+              - {get_param: Debug}
            tripleo_container_image_prepare_roles: {{ roles }}
            tripleo_container_image_prepare_content:
              parameter_defaults:
--- a/deployment/deprecated/mistral/mistral-base.yaml
+++ b/deployment/deprecated/mistral/mistral-base.yaml
@ -33,11 +33,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  MistralDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Mistral services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -61,7 +59,6 @@ parameters:
    description: Mistral RPC timeout

 conditions:
-  service_debug_unset: {equals : [{get_param: MistralDebug}, '']}
  enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}

 outputs:
@ -93,9 +90,9 @@ outputs:
        mistral::notification_driver: {get_param: NotificationDriver}
        mistral::logging::debug:
          if:
-          - service_debug_unset
-          - {get_param: Debug }
-          - {get_param: MistralDebug }
+          - {get_param: MistralDebug}
+          - true
+          - {get_param: Debug}
        mistral::rpc_response_timeout: {get_param: MistralRpcResponseTimeout}
        mistral::keystone::authtoken::project_name: 'service'
        mistral::keystone::authtoken::user_domain_name: 'Default'
--- a/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
+++ b/deployment/deprecated/zaqar/zaqar-container-puppet.yaml
@ -44,11 +44,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    default: false
  ZaqarDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Zaqar service.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -90,7 +88,6 @@ parameters:

 conditions:
  internal_tls_enabled: {get_param: EnableInternalTLS}
-  service_debug_unset: {equals : [{get_param: ZaqarDebug}, '']}
  zaqar_management_store_sqlalchemy: {equals : [{get_param: ZaqarManagementStore}, 'sqlalchemy']}
  zaqar_workers_zero: {equals : [{get_param: ZaqarWorkers}, 0]}
  zaqar_messaging_store_swift: {equals : [{get_param: ZaqarMessageStore}, 'swift']}
@ -159,8 +156,8 @@ outputs:
            zaqar::keystone::trust::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]}
            zaqar::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
+              - {get_param: ZaqarDebug }
+              - true
              - {get_param: ZaqarDebug }
            zaqar::server::service_name: 'httpd'
            zaqar::transport::websocket::bind:
--- a/deployment/experimental/designate/designate-base.yaml
+++ b/deployment/experimental/designate/designate-base.yaml
@ -32,9 +32,9 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  DesignateDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Designate services.
-    type: string
+    type: boolean
  EnableConfigPurge:
    type: boolean
    default: false
@ -77,9 +77,6 @@ parameter_groups:
  - RabbitClientUseSSL
  - RabbitClientPort

-conditions:
-  service_debug_unset: {equals : [{get_param: DesignateDebug}, '']}
-
 outputs:
  role_data:
    description: Base role data for Designate services
@ -88,8 +85,8 @@ outputs:
       config_settings:
         designate::logging::debug:
          if:
-          - service_debug_unset
+          - {get_param: DesignateDebug}
+          - true
          - {get_param: Debug }
-          - {get_param: DesignateDebug }
         designate::purge_config: {get_param: EnableConfigPurge}
         designate::notification_driver: {get_param: NotificationDriver}
--- a/deployment/glance/glance-api-container-puppet.yaml
+++ b/deployment/glance/glance-api-container-puppet.yaml
@ -38,11 +38,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  GlanceDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Glance service.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -339,7 +337,6 @@ conditions:

  use_tls_proxy: {equals : [{get_param: EnableInternalTLS}, true]}
  glance_workers_unset: {equals : [{get_param: GlanceWorkers}, '']}
-  service_debug_unset: {equals : [{get_param: GlanceDebug}, '']}
  glance_netapp_nfs_enabled: {equals : [{get_param: GlanceNetappNfsEnabled}, true]}
  glance_cache_enabled: {equals : [{get_param: GlanceCacheEnabled}, true]}
  glance_multiple_locations:
@ -430,9 +427,9 @@ outputs:
            glance::api::enable_proxy_headers_parsing: true
            glance::api::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
-              - {get_param: GlanceDebug }
+              - {get_param: GlanceDebug}
+              - true
+              - {get_param: Debug}
            glance::policy::policies: {get_param: GlanceApiPolicies}
            glance::api::authtoken::project_name: 'service'
            glance::api::authtoken::region_name: {get_param: KeystoneRegion}
--- a/deployment/gnocchi/gnocchi-base.yaml
+++ b/deployment/gnocchi/gnocchi-base.yaml
@ -63,11 +63,9 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  GnocchiDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Gnocchi services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -106,7 +104,6 @@ parameters:
    type: string

 conditions:
-  service_debug_unset: {equals : [{get_param: GnocchiDebug}, '']}
  enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}

 outputs:
@ -123,9 +120,9 @@ outputs:
        gnocchi_redis_password: {get_param: RedisPassword}
        gnocchi::logging::debug:
          if:
-          - service_debug_unset
-          - {get_param: Debug }
-          - {get_param: GnocchiDebug }
+          - {get_param: GnocchiDebug}
+          - true
+          - {get_param: Debug}
        gnocchi::db::database_connection:
          make_url:
            scheme: {get_param: [EndpointMap, MysqlInternal, protocol]}
--- a/deployment/heat/heat-base-puppet.yaml
+++ b/deployment/heat/heat-base-puppet.yaml
@ -9,11 +9,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  HeatDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Heat services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  ServiceData:
    default: {}
    description: Dictionary packing service data
@ -139,7 +137,6 @@ parameters:
    type: boolean

 conditions:
-  service_debug_unset: {equals : [{get_param: HeatDebug}, '']}
  tls_cache_enabled:
    and:
      - {get_param: EnableCache}
@ -161,9 +158,9 @@ outputs:
          - heat::notification_driver: {get_param: NotificationDriver}
            heat::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
-              - {get_param: HeatDebug }
+              - {get_param: HeatDebug}
+              - true
+              - {get_param: Debug}
            heat::enable_proxy_headers_parsing: true
            heat::rpc_response_timeout: 600
            heat::rabbit_heartbeat_timeout_threshold: 60
--- a/deployment/horizon/horizon-container-puppet.yaml
+++ b/deployment/horizon/horizon-container-puppet.yaml
@ -38,11 +38,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  HorizonDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Horizon service.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  HorizonAllowedHosts:
    default: '*'
    description: A list of IP/Hostname for the server Horizon is running on.
@ -151,7 +149,6 @@ parameter_groups:
  - MemcachedIPv6

 conditions:
-  service_debug_unset: {equals : [{get_param: HorizonDebug}, '']}
  websso_enabled: {equals : [{get_param: WebSSOEnable}, True]}
  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
  horizon_domain_choices_set: {not: {equals: [{get_param: HorizonDomainChoices}, []]}}
@ -161,16 +158,8 @@ conditions:
      - 6
  horizon_logger_debug:
    or:
-      - and:
-          - service_debug_unset
-          - get_param: Debug
-      - and:
-          - not: service_debug_unset
-          - yaql:
-              expression: $.data.horizon_debug.matches("true|True|TRUE")
-              data:
-                horizon_debug:
-                  get_param: HorizonDebug
+      - {get_param: Debug}
+      - {get_param: HorizonDebug}

 resources:

@ -243,9 +232,9 @@ outputs:
          - {}
        -
          if:
-          - service_debug_unset
-          - horizon::django_debug: { get_param: Debug }
-          - horizon::django_debug: { get_param: HorizonDebug }
+          - {get_param: HorizonDebug}
+          - horizon::django_debug: true
+          - horizon::django_debug: {get_param: Debug}
        - if:
          - horizon_logger_debug
          - horizon::log_level: 'DEBUG'
--- a/deployment/ironic/ironic-base-puppet.yaml
+++ b/deployment/ironic/ironic-base-puppet.yaml
@ -32,11 +32,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  IronicDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Ironic services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -59,7 +57,6 @@ parameters:
      - allowed_values: [ '', 'oslo', 'json-rpc']

 conditions:
-  service_debug_unset: {equals : [{get_param: IronicDebug}, '']}
  default_rsc_unset: {equals : [{get_param: IronicDefaultResourceClass}, '']}
  rpc_transport_unset: {equals : [{get_param: IronicRpcTransport}, '']}
  enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}
@ -94,9 +91,9 @@ outputs:

          ironic::logging::debug:
            if:
-            - service_debug_unset
-            - {get_param: Debug }
-            - {get_param: IronicDebug }
+            - {get_param: IronicDebug}
+            - True
+            - {get_param: Debug}
        -
          if:
          - default_rsc_unset
--- a/deployment/ironic/ironic-conductor-container-puppet.yaml
+++ b/deployment/ironic/ironic-conductor-container-puppet.yaml
@ -69,11 +69,9 @@ parameters:
    tags:
      - role_specific
  IronicDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Ironic services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  IronicDefaultBootOption:
    default: 'local'
    description: How to boot the bare metal instances. Set to 'local' (the
@ -261,10 +259,8 @@ conditions:
  default_inspect_interface_unset: {equals : [{get_param: IronicDefaultInspectInterface}, '']}
  service_debug:
    or:
-      - equals: [{get_param: IronicDebug}, 'true']
-      - equals: [{get_param: IronicDebug}, 'True']
-      - equals: [{get_param: IronicDebug}, 'TRUE']
-      - equals: [{get_param: Debug}, true]
+      - {get_param: IronicDebug}
+      - {get_param: Debug}
  enable_architecture_ppc64le: {contains: ['ppc64le', {get_param: AdditionalArchitectures}]}
  configure_swift_temp_url: {equals: [{get_param: IronicConfigureSwiftTempUrlKey}, true]}
  ironic_conductor_group:
--- a/deployment/keystone/keystone-container-puppet.yaml
+++ b/deployment/keystone/keystone-container-puppet.yaml
@ -108,11 +108,9 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  KeystoneDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Keystone service.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableCache:
    description: Enable caching with memcached
    type: boolean
@ -353,7 +351,6 @@ conditions:
  keystone_ldap_domain_enabled: {equals: [{get_param: KeystoneLDAPDomainEnable}, True]}
  keystone_federation_enabled: {equals: [{get_param: KeystoneFederationEnable}, True]}
  keystone_openidc_enabled: {equals: [{get_param: KeystoneOpenIdcEnable}, True]}
-  service_debug_unset: {equals : [{get_param: KeystoneDebug}, '']}
  nontls_cache_enabled:
    and:
      - {get_param: EnableCache}
@ -434,9 +431,9 @@ outputs:
            keystone::fernet_replace_keys: {get_param: ManageKeystoneFernetKeys}
            keystone::logging::debug:
              if:
-              - service_debug_unset
+              - {get_param: KeystoneDebug}
+              - true
              - {get_param: Debug }
-              - {get_param: KeystoneDebug }
            keystone::notification_driver: {get_param: NotificationDriver}
            keystone::notification_format: {get_param: KeystoneNotificationFormat}
            tripleo::profile::base::keystone::extra_notification_topics: {get_param: KeystoneNotificationTopics}
--- a/deployment/manila/manila-base.yaml
+++ b/deployment/manila/manila-base.yaml
@ -36,11 +36,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  ManilaDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Manila services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -56,7 +54,6 @@ parameters:
    description: Driver or drivers to handle sending notifications.

 conditions:
-  service_debug_unset: {equals : [{get_param: ManilaDebug}, '']}
  manila_ipv6: {equals : [{get_param: ManilaIPv6}, true]}
  enable_sqlalchemy_collectd: {equals : [{get_param: EnableSQLAlchemyCollectd}, true]}

@ -69,9 +66,9 @@ outputs:
        manila::notification_driver: {get_param: NotificationDriver}
        manila::logging::debug:
          if:
-          - service_debug_unset
-          - {get_param: Debug }
-          - {get_param: ManilaDebug }
+          - {get_param: ManilaDebug}
+          - true
+          - {get_param: Debug}
        manila::db::database_db_max_retries: -1
        manila::db::database_max_retries: -1
        manila::sql_connection:
--- a/deployment/memcached/memcached-container-puppet.yaml
+++ b/deployment/memcached/memcached-container-puppet.yaml
@ -51,11 +51,9 @@ parameters:
    description: Set to True to enable debugging on all services.
    type: boolean
  MemcachedDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Memcached service.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  MemcachedIpSubnet:
    default: ''
    description: IP address/subnet on the memcached network. If empty (default), MemcachedNetwork
@ -98,11 +96,7 @@ conditions:
      - internal_tls_enabled
      - not: {equals: [{get_param: MemcachedPort}, 11211]}
  memcached_network_unset: {equals : [{get_param: MemcachedIpSubnet}, '']}
-  service_debug:
-    or:
-      - equals: [{get_param: MemcachedDebug}, 'true']
-      - equals: [{get_param: MemcachedDebug}, 'True']
-      - equals: [{get_param: Debug}, true]
+  service_debug: {get_param: MemcachedDebug}
  is_ipv6:
    equals:
      - {get_param: [ServiceData, net_ip_version_map, {get_param: [ServiceNetMap, MemcachedNetwork]}]}
--- a/deployment/neutron/neutron-base.yaml
+++ b/deployment/neutron/neutron-base.yaml
@ -37,11 +37,9 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  NeutronDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Neutron services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableConfigPurge:
    type: boolean
    default: false
@ -111,7 +109,6 @@ parameters:

 conditions:
  dhcp_agents_zero: {equals : [{get_param: NeutronDhcpAgentsPerNetwork}, 0]}
-  service_debug_unset: {equals : [{get_param: NeutronDebug}, '']}
  global_physnet_mtu_unset: {equals: [{get_param: NeutronGlobalPhysnetMtu}, 0]}

 outputs:
@ -126,9 +123,9 @@ outputs:
            neutron::service_plugins: {get_param: NeutronServicePlugins}
            neutron::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
-              - {get_param: NeutronDebug }
+              - {get_param: NeutronDebug}
+              - true
+              - {get_param: Debug}
            neutron::purge_config: {get_param: EnableConfigPurge}
            neutron::allow_overlapping_ips: true
            neutron::dhcp_agent_notification: {get_param: DhcpAgentNotification}
--- a/deployment/neutron/neutron-dhcp-container-puppet.yaml
+++ b/deployment/neutron/neutron-dhcp-container-puppet.yaml
@ -102,11 +102,9 @@ parameters:
    default: 'overcloud-neutron-dhcp'
    type: string
  NeutronDhcpAgentDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging for Neutron DHCP agent.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  NeutronDhcpAgentDnsmasqDnsServers:
    default: []
    description: List of servers to use as dnsmasq forwarders
@ -161,8 +159,6 @@ conditions:
  dnsmasq_wrapper_enabled: {equals: [{get_param: NeutronEnableDnsmasqDockerWrapper}, true]}
  haproxy_wrapper_enabled: {equals: [{get_param: NeutronEnableHaproxyDockerWrapper}, true]}
  docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
-  service_wrapper_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
-  service_debug_unset: {equals: [{get_param: NeutronDhcpAgentDebug}, '']}
  dhcp_ovs_intergation_bridge_unset: {equals: [{get_param: NeutronDhcpOvsIntegrationBridge}, '']}
  az_unset: {equals: [{get_param: NeutronDhcpAgentAvailabilityZone}, '']}
  key_size_override_unset: {equals: [{get_param: NeutronDhcpCertificateKeySize}, '']}
@ -228,9 +224,9 @@ outputs:
            tripleo::profile::base::neutron::dhcp_agent_wrappers::haproxy_image: {get_param: ContainerNeutronDHCPImage}
            tripleo::profile::base::neutron::dhcp_agent_wrappers::debug:
              if:
-                - service_wrapper_debug_unset
-                - {get_param: Debug }
                - {get_param: NeutronWrapperDebug}
+                - true
+                - {get_param: Debug }
            tripleo::profile::base::neutron::container_cli: {get_param: ContainerCli}
            neutron::agents::dhcp::enable_isolated_metadata: {get_param: NeutronEnableIsolatedMetadata}
            neutron::agents::dhcp::enable_force_metadata: {get_param: NeutronEnableForceMetadata}
@ -242,9 +238,9 @@ outputs:
            neutron::agents::dhcp::dnsmasq_enable_addr6_list: {get_param: NeutronDhcpAgentDnsmasqEnableAddr6List}
            neutron::agents::dhcp::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug}
              - {get_param: NeutronDhcpAgentDebug}
+              - true
+              - {get_param: Debug}
          - if:
              - internal_tls_enabled
              - neutron::agents::dhcp::ovsdb_agent_ssl_key_file: '/etc/pki/tls/private/neutron.key'
@ -450,9 +446,9 @@ outputs:
                haproxy_wrapper_enabled: {get_param: NeutronEnableHaproxyDockerWrapper}
                debug_enabled:
                  if:
-                    - service_debug_unset
-                    - {get_param: Debug }
                    - {get_param: NeutronWrapperDebug}
+                    - true
+                    - {get_param: Debug }
                docker_additional_sockets: {get_param: DockerAdditionalSockets}
            - name: create kill_scripts directory within /var/lib/neutron
              file:
--- a/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml
+++ b/deployment/neutron/neutron-l2gw-agent-baremetal-puppet.yaml
@ -59,11 +59,9 @@ parameters:
    default: 'overcloud-neutron-l2gw-agent'
    type: string
  NeutronL2gwAgentDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging for Neutron L2gw agent.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  NeutronL2gwAgentLoggingSource:
    type: json
    default:
@ -71,7 +69,6 @@ parameters:
      file: /var/log/neutron/l2gw-agent.log

 conditions:
-  service_debug_unset: {equals: [{get_param: NeutronL2gwAgentDebug}, '']}
  internal_manager_enabled: {equals: [{get_param: L2gwAgentEnableManager}, True]}

 outputs:
@ -96,9 +93,9 @@ outputs:
        neutron::agents::l2gw::socket_timeout: {get_param: L2gwAgentSocketTimeout}
        neutron::agents::l2gw::debug:
          if:
-          - service_debug_unset
-          - {get_param: Debug}
          - {get_param: NeutronL2gwAgentDebug}
+          - true
+          - {get_param: Debug}
      service_config_settings:
        rsyslog:
          tripleo_logging_sources_neutron_l2gw_agent:
--- a/deployment/neutron/neutron-l3-container-puppet.yaml
+++ b/deployment/neutron/neutron-l3-container-puppet.yaml
@ -98,11 +98,9 @@ parameters:
    default: 'overcloud-neutron-l3-agent'
    type: string
  NeutronL3AgentDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging for Neutron L3 agent.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  # NOTE(bogdando): we allow the L3 agent to have AZ configs defined disregard of
  # the used NeutronMechanismDrivers.
  NeutronL3AgentAvailabilityZone:
@ -133,7 +131,6 @@ conditions:
  dibbler_wrapper_enabled: {equals: [{get_param: NeutronEnableDibblerDockerWrapper}, true]}
  radvd_wrapper_enabled: {equals: [{get_param: NeutronEnableRadvdDockerWrapper}, true]}
  docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
-  service_debug_unset: {equals : [{get_param: NeutronWrapperDebug}, false]}
  az_unset: {equals: [{get_param: NeutronL3AgentAvailabilityZone}, '']}
  l3_agent_extensions_empty: {equals : [{get_param: NeutronL3AgentExtensions}, "''"]}

@ -200,15 +197,15 @@ outputs:
            tripleo::profile::base::neutron::l3_agent_wrappers::radvd_image: {get_param: ContainerNeutronL3AgentImage}
            tripleo::profile::base::neutron::l3_agent_wrappers::debug:
              if:
-                - service_debug_unset
-                - {get_param: Debug }
                - {get_param: NeutronWrapperDebug}
+                - true
+                - {get_param: Debug }
            tripleo::profile::base::neutron::container_cli: {get_param: ContainerCli}
          - neutron::agents::l3::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug}
              - {get_param: NeutronL3AgentDebug}
+              - true
+              - {get_param: Debug}
          - if:
            - az_unset
            - {}
@ -356,9 +353,9 @@ outputs:
                radvd_wrapper_enabled: {get_param: NeutronEnableRadvdDockerWrapper}
                debug_enabled:
                  if:
-                    - service_debug_unset
-                    - {get_param: Debug }
                    - {get_param: NeutronWrapperDebug}
+                    - true
+                    - {get_param: Debug}
                docker_additional_sockets: {get_param: DockerAdditionalSockets}
            - name: create kill_scripts directory within /var/lib/neutron
              file:
--- a/deployment/neutron/neutron-metadata-container-puppet.yaml
+++ b/deployment/neutron/neutron-metadata-container-puppet.yaml
@ -65,18 +65,15 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  NeutronMetadataAgentDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging for Neutron Metadata agent.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  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]}
  is_neutron_shared_metadata_notempty: {not: {equals: [{get_param: NeutronMetadataProxySharedSecret}, '']}}

@ -114,9 +111,9 @@ outputs:
            neutron::agents::metadata::auth_tenant: 'service'
            neutron::agents::metadata::debug:
                if:
-                - service_debug_unset
-                - {get_param: Debug}
                - {get_param: NeutronMetadataAgentDebug}
+                - true
+                - {get_param: Debug}
            neutron::agents::metadata::metadata_host:
              str_replace:
                template:
--- a/deployment/nova/nova-base-puppet.yaml
+++ b/deployment/nova/nova-base-puppet.yaml
@ -61,11 +61,9 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  NovaDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Nova services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableCache:
    description: Enable caching with memcached
    type: boolean
@ -252,7 +250,6 @@ parameters:
 conditions:

  compute_upgrade_level_empty: {equals : [{get_param: UpgradeLevelNovaCompute}, '']}
-  service_debug_unset: {equals : [{get_param: NovaDebug}, '']}
  tls_cache_enabled:
    and:
      - {get_param: EnableCache}
@ -300,9 +297,9 @@ outputs:
          nova::os_region_name: {get_param: KeystoneRegion}
          nova::logging::debug:
            if:
-            - service_debug_unset
-            - {get_param: Debug }
-            - {get_param: NovaDebug }
+            - {get_param: NovaDebug}
+            - true
+            - {get_param: Debug}
          nova::purge_config: {get_param: EnableConfigPurge}
          nova::network::neutron::project_name: 'service'
          nova::network::neutron::username: 'neutron'
--- a/deployment/octavia/octavia-base.yaml
+++ b/deployment/octavia/octavia-base.yaml
@ -32,11 +32,9 @@ parameters:
    default: false
    description: Set to True to enable debugging on all services.
  OctaviaDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging Octavia services.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableSQLAlchemyCollectd:
    type: boolean
    description: >
@ -210,7 +208,6 @@ parameters:
    type: boolean

 conditions:
-  service_debug_unset: {equals : [{get_param: OctaviaDebug}, '']}
  octavia_ca_cert_unset: {equals: [{get_param: OctaviaCaCert}, '']}
  octavia_ca_key_unset: {equals: [{get_param: OctaviaCaKey}, '']}
  octavia_client_cert_unset: {equals: [{get_param: OctaviaClientCert}, '']}
@ -226,9 +223,9 @@ outputs:
        map_merge:
          - octavia::logging::debug:
              if:
-              - service_debug_unset
-              - {get_param: Debug }
-              - {get_param: OctaviaDebug }
+              - {get_param: OctaviaDebug}
+              - true
+              - {get_param: Debug}
            octavia::purge_config: {get_param: EnableConfigPurge}
            octavia::notification_driver: {get_param: NotificationDriver}
            octavia::db::database_connection:
--- a/deployment/ovn/ovn-metadata-container-puppet.yaml
+++ b/deployment/ovn/ovn-metadata-container-puppet.yaml
@ -93,11 +93,9 @@ parameters:
    default: 'overcloud-ovn-metadata'
    type: string
  OvnMetadataAgentDebug:
-    default: ''
+    default: false
    description: Set to True to enable debugging for OVN Metadata agent.
-    type: string
-    constraints:
-      - allowed_values: [ '', 'true', 'True', 'TRUE', 'false', 'False', 'FALSE']
+    type: boolean
  EnableInternalTLS:
    type: boolean
    default: false
@ -129,7 +127,6 @@ parameters:
 conditions:
  haproxy_wrapper_enabled: {equals: [{get_param: OVNEnableHaproxyDockerWrapper}, true]}
  docker_enabled: {equals: [{get_param: ContainerCli}, 'docker']}
-  service_debug_unset: {equals : [{get_param: OVNWrapperDebug}, false]}
  internal_tls_enabled: {equals: [{get_param: EnableInternalTLS}, true]}
  neutron_metadata_workers_unset: {equals : [{get_param: NeutronMetadataWorkers}, '']}
  key_size_override_unset: {equals: [{get_param: OvnMetadataCertificateKeySize}, '']}
@ -168,9 +165,9 @@ outputs:
            tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::haproxy_image: {get_param: ContainerOvnMetadataImage}
            tripleo::profile::base::neutron::ovn_metadata_agent_wrappers::debug:
              if:
-                - service_debug_unset
-                - {get_param: Debug }
                - {get_param: OVNWrapperDebug}
+                - true
+                - {get_param: Debug}
            tripleo::profile::base::neutron::container_cli: {get_param: ContainerCli}
            neutron::agents::ovn_metadata::shared_secret: {get_param: NeutronMetadataProxySharedSecret}
            neutron::agents::ovn_metadata::auth_password: {get_param: NeutronPassword}
@ -182,9 +179,9 @@ outputs:
            neutron::agents::ovn_metadata::ovn_remote_probe_interval: {get_param: OVNRemoteProbeInterval}
            neutron::agents::ovn_metadata::debug:
                if:
-                - service_debug_unset
-                - {get_param: Debug}
                - {get_param: OvnMetadataAgentDebug}
+                - true
+                - {get_param: Debug}
            neutron::agents::ovn_metadata::metadata_protocol:
              if:
              - internal_tls_enabled
@ -383,9 +380,9 @@ outputs:
                haproxy_wrapper_enabled: {get_param: OVNEnableHaproxyDockerWrapper}
                debug_enabled:
                  if:
-                    - service_debug_unset
-                    - {get_param: Debug }
-                    - {get_param: NeutronWrapperDebug}
+                    - {get_param: OVNWrapperDebug}
+                    - true
+                    - {get_param: Debug}
                docker_additional_sockets: {get_param: DockerAdditionalSockets}
            - name: create kill_scripts directory within /var/lib/neutron
              file:
--- a/releasenotes/notes/ensure-all-debug-params-boolean-b1256f282e414b98.yaml
+++ b/releasenotes/notes/ensure-all-debug-params-boolean-b1256f282e414b98.yaml
@ -0,0 +1,6 @@
+---
+upgrade:
+  - |
+    All service ``Debug`` parameters are now booleans as
+    expected by oslo. This helps in proper validation and
+    service template composition complexities.