Merge "Make turning debug on globally easy."

4 files changed, 25 insertions, 0 deletions

diff --git a/nova-compute-config.yaml b/nova-compute-config.yaml
index 90387d79..48cfcf81 100644
--- a/nova-compute-config.yaml
+++ b/nova-compute-config.yaml
@@ -8,11 +8,13 @@ resources:
           compute_driver: { get_input: nova_compute_driver }
           compute_libvirt_type: { get_input: nova_compute_libvirt_type }
           db: {get_input: nova_dsn}
+          debug: {get_param: Debug}
           host: {get_input: nova_api_host}
           public_ip: {get_input: nova_public_ip}
           service-password: {get_input: nova_password}
         ceilometer:
           db: {get_input: ceilometer_dsn}
+          debug: {get_param: Debug}
           metering_secret: {get_input: ceilometer_metering_secret}
           service-password: {get_input: ceilometer_password}
           compute_agent: {get_input: ceilometer_compute_agent}
@@ -21,12 +23,15 @@ resources:
           readonly_user_name: {get_input: snmpd_readonly_user_name}
           readonly_user_password: {get_input: snmpd_readonly_user_password}
         glance:
+          debug: {get_param: Debug}
           host: {get_input: glance_host}
           port: {get_input: glance_port}
           protocol: {get_input: glance_protocol}
         keystone:
+          debug: {get_param: Debug}
           host: {get_input: keystone_host}
         neutron:
+          debug: {get_param: Debug}
           flat-networks: {get_input: neutron_flat_networks}
           host: {get_input: neutron_host}
           ovs_db: {get_input: neutron_dsn}
diff --git a/overcloud-source.yaml b/overcloud-source.yaml
index e2423047..0ed117b2 100644
--- a/overcloud-source.yaml
+++ b/overcloud-source.yaml
@@ -25,6 +25,10 @@ parameters:
     default: 5000
     description: The size of the loopback file used by the cinder LVM driver.
     type: number
+  Debug:
+    default: ''
+    description: Set to True to enable debugging on all services.
+    type: string
   ExtraConfig:
     default: {}
     description: |
@@ -441,6 +445,7 @@ resources:
               - - mysql://cinder:unset@
                 - *database_host
                 - /cinder
+          debug: {get_param: Debug}
           volume_size_mb:
             get_param: CinderLVMLoopDeviceSize
           service-password:
@@ -471,6 +476,7 @@ resources:
               - - mysql://glance:unset@
                 - *database_host
                 - /glance
+          debug: {get_param: Debug}
           host:
             get_input: controller_virtual_ip
           port:
@@ -498,6 +504,7 @@ resources:
               - - mysql://heat:unset@
                 - *database_host
                 - /heat
+          debug: {get_param: Debug}
           stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
           watch_server_url: {get_input: heat.watch_server_url}
           metadata_server_url: {get_input: heat.metadata_server_url}
@@ -516,6 +523,7 @@ resources:
               - - mysql://keystone:unset@
                 - *database_host
                 - /keystone
+          debug: {get_param: Debug}
           host:
             get_input: controller_virtual_ip
           ca_certificate: {get_param: KeystoneCACertificate}
@@ -535,6 +543,7 @@ resources:
               - - 'tripleo'
                 - {get_resource: MysqlClusterUniquePart}
         neutron:
+          debug: {get_param: Debug}
           flat-networks: {get_param: NeutronFlatNetworks}
           host: {get_input: controller_virtual_ip}
           metadata_proxy_shared_secret: unset
@@ -571,6 +580,7 @@ resources:
               - - mysql://ceilometer:unset@
                 - *database_host
                 - /ceilometer
+          debug: {get_param: Debug}
           metering_secret: {get_param: CeilometerMeteringSecret}
           service-password:
             get_param: CeilometerPassword
diff --git a/undercloud-source.yaml b/undercloud-source.yaml
index 369bd3fd..0788e8b6 100644
--- a/undercloud-source.yaml
+++ b/undercloud-source.yaml
@@ -29,6 +29,10 @@ parameters:
     description: The password for the ceilometer service account.
     type: string
     hidden: true
+  Debug:
+    default: ''
+    description: Set to True to enable debugging on all services.
+    type: string
   SnmpdReadonlyUserName:
     default: ro_snmp_user
     description: The user name for SNMPd with readonly rights running on all Overcloud nodes
@@ -250,6 +254,7 @@ resources:
           quorum_policy : ignore
         ceilometer:
           db: mysql://ceilometer:unset@localhost/ceilometer
+          debug: {get_param: Debug}
           metering_secret: {get_param: CeilometerMeteringSecret}
           snmpd_readonly_user_name:
             get_param: SnmpdReadonlyUserName
@@ -261,6 +266,7 @@ resources:
         glance:
           backend: file
           db: mysql://glance:unset@localhost/glance
+          debug: {get_param: Debug}
           host: 127.0.0.1
           port:
             get_param: GlancePort
@@ -279,12 +285,14 @@ resources:
           admin_user: heat
           auth_encryption_key: unset___________
           db: mysql://heat:unset@localhost/heat
+          debug: {get_param: Debug}
           stack_domain_admin_password: {get_param: HeatStackDomainAdminPassword}
           watch_server_url: {get_input: heat.watch_server_url}
           metadata_server_url: {get_input: heat.metadata_server_url}
           waitcondition_server_url: {get_input: heat.waitcondition_server_url}
         keystone:
           db: mysql://keystone:unset@localhost/keystone
+          debug: {get_param: Debug}
           host: 127.0.0.1
           ca_certificate: {get_param: KeystoneCACertificate}
           signing_key: {get_param: KeystoneSigningKey}
@@ -293,6 +301,7 @@ resources:
           innodb_buffer_pool_size: {get_param: MysqlInnodbBufferPoolSize}
           root-password: {get_resource: MysqlRootPassword}
         neutron:
+          debug: {get_param: Debug}
           host: 127.0.0.1
           ovs_db: mysql://neutron:unset@localhost/ovs_neutron?charset=utf8
           ovs:
diff --git a/undercloud-vm-ironic-config.yaml b/undercloud-vm-ironic-config.yaml
index 1a90504a..af049d87 100644
--- a/undercloud-vm-ironic-config.yaml
+++ b/undercloud-vm-ironic-config.yaml
@@ -8,6 +8,7 @@ resources:
           compute_driver: ironic.nova.virt.ironic.driver.IronicDriver
           compute_manager: ironic.nova.compute.manager.ClusteredComputeManager
           db: mysql://nova:unset@localhost/nova
+          debug: {get_param: Debug}
           default_ephemeral_format: ext4
           host: 127.0.0.1
           metadata-proxy: false