Browse Source

Move debug param to <module>::logging class

Related change [1] we will cleanup these deprecated
one in the near future.

[1] https://review.openstack.org/#/c/620415/

Depends-On: https://review.openstack.org/#/c/620535/
Change-Id: I903cabe1a50cd02d228b594ee41d2adf58c7f42a
Tobias Urdin 4 months ago
parent
commit
d675e77360

+ 4
- 1
packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp View File

@@ -19,9 +19,12 @@ class packstack::ceilometer::rabbitmq ()
19 19
       File[$files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
20 20
     }
21 21
 
22
+    class { '::ceilometer::logging':
23
+      debug => hiera('CONFIG_DEBUG_MODE'),
24
+    }
25
+
22 26
     class { '::ceilometer':
23 27
       telemetry_secret   => hiera('CONFIG_CEILOMETER_SECRET'),
24
-      debug              => hiera('CONFIG_DEBUG_MODE'),
25 28
       rabbit_use_ssl     => hiera('CONFIG_AMQP_SSL_ENABLED'),
26 29
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
27 30
       kombu_ssl_ca_certs => $kombu_ssl_ca_certs,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp View File

@@ -22,11 +22,14 @@ class packstack::cinder::rabbitmq ()
22 22
       }
23 23
     }
24 24
 
25
+    class { '::cinder::logging':
26
+      debug => hiera('CONFIG_DEBUG_MODE'),
27
+    }
28
+
25 29
     class { '::cinder':
26 30
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
27 31
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
28 32
       database_connection   => "mysql+pymysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder",
29
-      debug                 => hiera('CONFIG_DEBUG_MODE'),
30 33
       kombu_ssl_ca_certs    => $kombu_ssl_ca_certs,
31 34
       kombu_ssl_keyfile     => $kombu_ssl_keyfile,
32 35
       kombu_ssl_certfile    => $kombu_ssl_certfile,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/glance.pp View File

@@ -29,12 +29,15 @@ class packstack::glance ()
29 29
       password => hiera('CONFIG_GLANCE_KS_PW'),
30 30
     }
31 31
 
32
+    class { '::glance::api::logging':
33
+      debug => hiera('CONFIG_DEBUG_MODE'),
34
+    }
35
+
32 36
     class { '::glance::api':
33 37
       bind_host           => $bind_host,
34 38
       registry_host       => $registry_host,
35 39
       pipeline            => 'keystone',
36 40
       database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
37
-      debug               => hiera('CONFIG_DEBUG_MODE'),
38 41
       os_region_name      => hiera('CONFIG_KEYSTONE_REGION'),
39 42
       workers             => hiera('CONFIG_SERVICE_WORKERS'),
40 43
       stores              => ['file', 'http', 'swift'],

+ 4
- 1
packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp View File

@@ -34,11 +34,14 @@ class packstack::heat::rabbitmq ()
34 34
       auth_url   => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
35 35
     }
36 36
 
37
+    class { '::heat::logging':
38
+      debug => hiera('CONFIG_DEBUG_MODE'),
39
+    }
40
+
37 41
     class { '::heat':
38 42
       keystone_ec2_uri    => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
39 43
       rabbit_use_ssl      => hiera('CONFIG_AMQP_SSL_ENABLED'),
40 44
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
41
-      debug               => hiera('CONFIG_DEBUG_MODE'),
42 45
       database_connection => "mysql+pymysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat",
43 46
       kombu_ssl_ca_certs  => $kombu_ssl_ca_certs,
44 47
       kombu_ssl_keyfile   => $kombu_ssl_keyfile,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp View File

@@ -22,11 +22,14 @@ class packstack::ironic::rabbitmq ()
22 22
       File[$files_to_set_owner] ~> Service<| tag == 'ironic-service' |>
23 23
     }
24 24
 
25
+    class { '::ironic::logging':
26
+      debug => true,
27
+    }
28
+
25 29
     class { '::ironic':
26 30
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
27 31
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
28 32
       database_connection   => "mysql+pymysql://ironic:${ironic_rabbitmq_cfg_ironic_db_pw}@${ironic_rabbitmq_cfg_mariadb_host}/ironic",
29
-      debug                 => true,
30 33
       kombu_ssl_ca_certs    => $kombu_ssl_ca_certs,
31 34
       kombu_ssl_keyfile     => $kombu_ssl_keyfile,
32 35
       kombu_ssl_certfile    => $kombu_ssl_certfile,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/keystone.pp View File

@@ -27,13 +27,16 @@ class packstack::keystone ()
27 27
       }
28 28
     }
29 29
 
30
+    class { '::keystone::logging':
31
+      debug => hiera('CONFIG_DEBUG_MODE'),
32
+    }
33
+
30 34
     class { '::keystone':
31 35
       admin_token         => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
32 36
       admin_password      => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
33 37
       database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
34 38
       token_provider      => "${keystone_token_provider_str}",
35 39
       enable_fernet_setup => true,
36
-      debug               => hiera('CONFIG_DEBUG_MODE'),
37 40
       service_name        => 'httpd',
38 41
       enable_ssl          => $keystone_use_ssl,
39 42
       public_bind_host    => $bind_host,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp View File

@@ -23,10 +23,13 @@ class packstack::manila::rabbitmq ()
23 23
     $db_pw = hiera('CONFIG_MANILA_DB_PW')
24 24
     $mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
25 25
 
26
+    class { '::manila::logging':
27
+      debug => hiera('CONFIG_DEBUG_MODE'),
28
+    }
29
+
26 30
     class { '::manila':
27 31
       rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
28 32
       default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
29 33
       sql_connection        => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",
30
-      debug                 => hiera('CONFIG_DEBUG_MODE'),
31 34
     }
32 35
 }

+ 3
- 1
packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp View File

@@ -25,6 +25,9 @@ class packstack::neutron::rabbitmq ()
25 25
       File[$files_to_set_owner] ~> Service<| tag == 'neutron-service' |>
26 26
     }
27 27
 
28
+    class { '::neutron::logging':
29
+      debug => hiera('CONFIG_DEBUG_MODE'),
30
+    }
28 31
 
29 32
     class { '::neutron':
30 33
       bind_host             => $bind_host,
@@ -33,7 +36,6 @@ class packstack::neutron::rabbitmq ()
33 36
       core_plugin           => hiera('CONFIG_NEUTRON_CORE_PLUGIN'),
34 37
       allow_overlapping_ips => true,
35 38
       service_plugins       => hiera_array('SERVICE_PLUGINS'),
36
-      debug                 => hiera('CONFIG_DEBUG_MODE'),
37 39
       kombu_ssl_ca_certs    => $kombu_ssl_ca_certs,
38 40
       kombu_ssl_keyfile     => $kombu_ssl_keyfile,
39 41
       kombu_ssl_certfile    => $kombu_ssl_certfile,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/nova.pp View File

@@ -57,11 +57,14 @@ class packstack::nova ()
57 57
       $key = undef
58 58
     }
59 59
 
60
+    class { '::nova::logging':
61
+      debug => hiera('CONFIG_DEBUG_MODE'),
62
+    }
63
+
60 64
     class { '::nova':
61 65
       glance_api_servers            => "http://${nova_common_rabbitmq_cfg_storage_host}:9292",
62 66
       default_transport_url         => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
63 67
       rabbit_use_ssl                => hiera('CONFIG_AMQP_SSL_ENABLED'),
64
-      debug                         => hiera('CONFIG_DEBUG_MODE'),
65 68
       nova_public_key               => $public_key,
66 69
       nova_private_key              => $private_key,
67 70
       kombu_ssl_ca_certs            => $kombu_ssl_ca_certs,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp View File

@@ -19,11 +19,14 @@ class packstack::nova::ceilometer::rabbitmq ()
19 19
       File[$ceilometer_files_to_set_owner] ~> Service<| tag == 'ceilometer-service' |>
20 20
     }
21 21
 
22
+    class { '::ceilometer::logging':
23
+        debug => hiera('CONFIG_DEBUG_MODE'),
24
+    }
25
+
22 26
     class { '::ceilometer':
23 27
         telemetry_secret      => hiera('CONFIG_CEILOMETER_SECRET'),
24 28
         rabbit_use_ssl        => hiera('CONFIG_AMQP_SSL_ENABLED'),
25 29
         default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
26
-        debug                 => hiera('CONFIG_DEBUG_MODE'),
27 30
         # for some strange reason ceilometer needs to be in nova group
28 31
         require               => Package['nova-common'],
29 32
         kombu_ssl_ca_certs    => $ceilometer_kombu_ssl_ca_certs,

+ 4
- 1
packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp View File

@@ -23,10 +23,13 @@ class packstack::sahara::rabbitmq ()
23 23
       File[$files_to_set_owner] ~> Service<| tag == 'sahara-service' |>
24 24
     }
25 25
 
26
+    class { '::sahara::logging':
27
+      debug => hiera('CONFIG_DEBUG_MODE'),
28
+    }
29
+
26 30
     class { '::sahara':
27 31
       database_connection   =>
28 32
         "mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
29
-      debug                 => hiera('CONFIG_DEBUG_MODE'),
30 33
       admin_user            => 'sahara',
31 34
       admin_password        => hiera('CONFIG_SAHARA_KS_PW'),
32 35
       admin_tenant_name     => 'services',

+ 10
- 7
packstack/puppet/modules/packstack/manifests/trove.pp View File

@@ -13,14 +13,17 @@ class packstack::trove ()
13 13
       auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
14 14
     }
15 15
 
16
+    class { '::trove::logging':
17
+      debug => hiera('CONFIG_DEBUG_MODE'),
18
+    }
19
+
16 20
     class { '::trove::api':
17
-      bind_host         => $bind_host,
18
-      enabled           => true,
19
-      cert_file         => false,
20
-      key_file          => false,
21
-      ca_file           => false,
22
-      debug             => hiera('CONFIG_DEBUG_MODE'),
23
-      workers           => hiera('CONFIG_SERVICE_WORKERS'),
21
+      bind_host => $bind_host,
22
+      enabled   => true,
23
+      cert_file => false,
24
+      key_file  => false,
25
+      ca_file   => false,
26
+      workers   => hiera('CONFIG_SERVICE_WORKERS'),
24 27
     }
25 28
 
26 29
     class { '::trove::conductor':

Loading…
Cancel
Save