From ec8cc54df4252ba44d441d1e75437429b9f12325 Mon Sep 17 00:00:00 2001 From: Alex Schultz Date: Tue, 27 Nov 2018 10:30:04 -0700 Subject: [PATCH] Switch debug to use logging classes The puppet openstack modules have switched the debug setting to a logging class in the modules. They are starting to remove the base debug option so we need to switch our usages to use the logging classes Change-Id: I690448db2de341ec428181f19364c93a3273b565 Needed-By: https://review.openstack.org/#/c/619379/ --- deployment/aodh/aodh-base.yaml | 2 +- puppet/services/ceilometer-base.yaml | 2 +- puppet/services/cinder-base.yaml | 2 +- puppet/services/congress.yaml | 2 +- puppet/services/designate-base.yaml | 2 +- puppet/services/glance-api.yaml | 2 +- puppet/services/gnocchi-base.yaml | 2 +- puppet/services/heat-base.yaml | 2 +- puppet/services/ironic-base.yaml | 2 +- puppet/services/ironic-inspector.yaml | 2 +- puppet/services/keystone.yaml | 2 +- puppet/services/manila-base.yaml | 2 +- puppet/services/mistral-base.yaml | 2 +- puppet/services/neutron-base.yaml | 2 +- puppet/services/nova-base.yaml | 2 +- puppet/services/octavia-base.yaml | 2 +- puppet/services/panko-base.yaml | 2 +- puppet/services/sahara-base.yaml | 2 +- puppet/services/tacker.yaml | 2 +- 19 files changed, 19 insertions(+), 19 deletions(-) diff --git a/deployment/aodh/aodh-base.yaml b/deployment/aodh/aodh-base.yaml index 1f4771fac2..a90bedb51b 100644 --- a/deployment/aodh/aodh-base.yaml +++ b/deployment/aodh/aodh-base.yaml @@ -95,7 +95,7 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - aodh::debug: + aodh::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/ceilometer-base.yaml b/puppet/services/ceilometer-base.yaml index c5e179c584..5e28c24e91 100644 --- a/puppet/services/ceilometer-base.yaml +++ b/puppet/services/ceilometer-base.yaml @@ -134,7 +134,7 @@ outputs: value: service_name: ceilometer_base config_settings: - ceilometer::debug: + ceilometer::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/cinder-base.yaml b/puppet/services/cinder-base.yaml index 63446f48e9..52f632f947 100644 --- a/puppet/services/cinder-base.yaml +++ b/puppet/services/cinder-base.yaml @@ -130,7 +130,7 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - cinder::debug: + cinder::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/congress.yaml b/puppet/services/congress.yaml index 8b111527d3..0c40d1fbd2 100644 --- a/puppet/services/congress.yaml +++ b/puppet/services/congress.yaml @@ -97,7 +97,7 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - congress::debug: + congress::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/designate-base.yaml b/puppet/services/designate-base.yaml index 13ba64fcd1..754c83e053 100644 --- a/puppet/services/designate-base.yaml +++ b/puppet/services/designate-base.yaml @@ -76,7 +76,7 @@ outputs: value: service_name: designate_base config_settings: - designate::debug: + designate::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml index f7883862e0..cbafbc8e36 100644 --- a/puppet/services/glance-api.yaml +++ b/puppet/services/glance-api.yaml @@ -245,7 +245,7 @@ outputs: glance::api::enable_v2_api: true glance::api::authtoken::password: {get_param: GlancePassword} glance::api::enable_proxy_headers_parsing: true - glance::api::debug: + glance::api::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/gnocchi-base.yaml b/puppet/services/gnocchi-base.yaml index 408e980777..782efaf604 100644 --- a/puppet/services/gnocchi-base.yaml +++ b/puppet/services/gnocchi-base.yaml @@ -114,7 +114,7 @@ outputs: config_settings: #Gnocchi engine gnocchi_redis_password: {get_param: RedisPassword} - gnocchi::debug: + gnocchi::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/heat-base.yaml b/puppet/services/heat-base.yaml index 58ded06d08..88aee86c31 100644 --- a/puppet/services/heat-base.yaml +++ b/puppet/services/heat-base.yaml @@ -153,7 +153,7 @@ outputs: heat::rabbit_password: {get_param: RpcPassword} heat::rabbit_use_ssl: {get_param: RpcUseSSL} heat::rabbit_port: {get_param: RpcPort} - heat::debug: + heat::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/ironic-base.yaml b/puppet/services/ironic-base.yaml index c975125afc..fdc4c56ca8 100644 --- a/puppet/services/ironic-base.yaml +++ b/puppet/services/ironic-base.yaml @@ -89,7 +89,7 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - ironic::debug: + ironic::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/ironic-inspector.yaml b/puppet/services/ironic-inspector.yaml index 4d6fc550e6..0373290c37 100644 --- a/puppet/services/ironic-inspector.yaml +++ b/puppet/services/ironic-inspector.yaml @@ -161,7 +161,7 @@ outputs: ironic::inspector::dnsmasq_dhcp_hostsdir: /var/lib/ironic-inspector/dhcp-hostsdir ironic::inspector::pxe_filter::dnsmasq::purge_dhcp_hostsdir: false ironic::inspector::pxe_filter::driver: dnsmasq - ironic::inspector::debug: {get_param: Debug} + ironic::inspector::logging::debug: {get_param: Debug} ironic::inspector::always_store_ramdisk_logs: {get_param: Debug} ironic::inspector::authtoken::www_authenticate_uri: {get_param: [EndpointMap, KeystoneInternal, uri] } ironic::inspector::authtoken::auth_url: {get_param: [EndpointMap, KeystoneInternal, uri_no_suffix]} diff --git a/puppet/services/keystone.yaml b/puppet/services/keystone.yaml index fee916bb0b..c0e7ad0782 100644 --- a/puppet/services/keystone.yaml +++ b/puppet/services/keystone.yaml @@ -400,7 +400,7 @@ outputs: content: {get_param: KeystoneCredential1} keystone::fernet_keys: {get_param: KeystoneFernetKeys} keystone::fernet_replace_keys: {get_param: ManageKeystoneFernetKeys} - keystone::debug: + keystone::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/manila-base.yaml b/puppet/services/manila-base.yaml index c0a680d389..da88059c5e 100644 --- a/puppet/services/manila-base.yaml +++ b/puppet/services/manila-base.yaml @@ -87,7 +87,7 @@ outputs: manila::rabbit_password: {get_param: RpcPassword} manila::rabbit_use_ssl: {get_param: RpcUseSSL} manila::rabbit_port: {get_param: RpcPort} - manila::debug: + manila::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/mistral-base.yaml b/puppet/services/mistral-base.yaml index face6dfd0c..7ff32a6fd1 100644 --- a/puppet/services/mistral-base.yaml +++ b/puppet/services/mistral-base.yaml @@ -97,7 +97,7 @@ outputs: mistral::rabbit_password: {get_param: RpcPassword} mistral::rabbit_use_ssl: {get_param: RpcUseSSL} mistral::rabbit_port: {get_param: RpcPort} - mistral::debug: + mistral::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/neutron-base.yaml b/puppet/services/neutron-base.yaml index f55fc98f43..79d0361d76 100644 --- a/puppet/services/neutron-base.yaml +++ b/puppet/services/neutron-base.yaml @@ -141,7 +141,7 @@ outputs: neutron::rabbit_port: {get_param: RpcPort} neutron::core_plugin: {get_param: NeutronCorePlugin} neutron::service_plugins: {get_param: NeutronServicePlugins} - neutron::debug: + neutron::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/nova-base.yaml b/puppet/services/nova-base.yaml index 4e67869ae6..e61796b713 100644 --- a/puppet/services/nova-base.yaml +++ b/puppet/services/nova-base.yaml @@ -300,7 +300,7 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - nova::debug: + nova::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/octavia-base.yaml b/puppet/services/octavia-base.yaml index 9e3c4f18d9..8d50a2f90a 100644 --- a/puppet/services/octavia-base.yaml +++ b/puppet/services/octavia-base.yaml @@ -119,7 +119,7 @@ outputs: config_settings: map_merge: - - octavia::debug: + - octavia::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/panko-base.yaml b/puppet/services/panko-base.yaml index 98c50795c4..7bbb4ba8e8 100644 --- a/puppet/services/panko-base.yaml +++ b/puppet/services/panko-base.yaml @@ -98,7 +98,7 @@ outputs: query: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - panko::debug: + panko::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/sahara-base.yaml b/puppet/services/sahara-base.yaml index 0930ff44ea..f80321a78e 100644 --- a/puppet/services/sahara-base.yaml +++ b/puppet/services/sahara-base.yaml @@ -96,7 +96,7 @@ outputs: sahara::rabbit_user: {get_param: RpcUserName} sahara::rabbit_use_ssl: {get_param: RpcUseSSL} sahara::rabbit_port: {get_param: RpcPort} - sahara::debug: + sahara::logging::debug: if: - service_debug_unset - {get_param: Debug } diff --git a/puppet/services/tacker.yaml b/puppet/services/tacker.yaml index c89bcb70e4..43292c13bd 100644 --- a/puppet/services/tacker.yaml +++ b/puppet/services/tacker.yaml @@ -98,7 +98,7 @@ outputs: read_default_file: /etc/my.cnf.d/tripleo.cnf read_default_group: tripleo - tacker::debug: + tacker::logging::debug: if: - service_debug_unset - {get_param: Debug }