x/packstack
Code Issues Proposed changes

Move debug param to <module>::logging class

Browse Source 
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
This commit is contained in:
Tobias Urdin
2018-11-28 10:08:19 +01:00
parent 952b0550f0
commit d675e77360
12 changed files with 53 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
packstack/puppet/modules/packstack/manifests/ceilometer/rabbitmq.pp
View File

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

5
packstack/puppet/modules/packstack/manifests/cinder/rabbitmq.pp
View File

@@ -22,11 +22,14 @@ class packstack::cinder::rabbitmq ()
} }
} }
class { '::cinder::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::cinder': class { '::cinder':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'), rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/", default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
database_connection => "mysql+pymysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder", database_connection => "mysql+pymysql://cinder:${cinder_rab_cfg_cinder_db_pw}@${cinder_rab_cfg_mariadb_host}/cinder",
debug => hiera('CONFIG_DEBUG_MODE'),
kombu_ssl_ca_certs => $kombu_ssl_ca_certs, kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile, kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile, kombu_ssl_certfile => $kombu_ssl_certfile,

5
packstack/puppet/modules/packstack/manifests/glance.pp
View File

@@ -29,12 +29,15 @@ class packstack::glance ()
password => hiera('CONFIG_GLANCE_KS_PW'), password => hiera('CONFIG_GLANCE_KS_PW'),
} }
class { '::glance::api::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::glance::api': class { '::glance::api':
bind_host => $bind_host, bind_host => $bind_host,
registry_host => $registry_host, registry_host => $registry_host,
pipeline => 'keystone', pipeline => 'keystone',
database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance", database_connection => "mysql+pymysql://glance:${glance_ks_pw}@${glance_mariadb_host}/glance",
debug => hiera('CONFIG_DEBUG_MODE'),
os_region_name => hiera('CONFIG_KEYSTONE_REGION'), os_region_name => hiera('CONFIG_KEYSTONE_REGION'),
workers => hiera('CONFIG_SERVICE_WORKERS'), workers => hiera('CONFIG_SERVICE_WORKERS'),
stores => ['file', 'http', 'swift'], stores => ['file', 'http', 'swift'],

5
packstack/puppet/modules/packstack/manifests/heat/rabbitmq.pp
View File

@@ -34,11 +34,14 @@ class packstack::heat::rabbitmq ()
auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'), auth_url => hiera('CONFIG_KEYSTONE_ADMIN_URL'),
} }
class { '::heat::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::heat': class { '::heat':
keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'), keystone_ec2_uri => hiera('CONFIG_KEYSTONE_PUBLIC_URL'),
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'), rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/", default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
debug => hiera('CONFIG_DEBUG_MODE'),
database_connection => "mysql+pymysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat", database_connection => "mysql+pymysql://heat:${heat_rabbitmq_cfg_heat_db_pw}@${heat_rabbitmq_cfg_mariadb_host}/heat",
kombu_ssl_ca_certs => $kombu_ssl_ca_certs, kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile, kombu_ssl_keyfile => $kombu_ssl_keyfile,

5
packstack/puppet/modules/packstack/manifests/ironic/rabbitmq.pp
View File

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

5
packstack/puppet/modules/packstack/manifests/keystone.pp
View File

@@ -27,13 +27,16 @@ class packstack::keystone ()
} }
} }
class { '::keystone::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::keystone': class { '::keystone':
admin_token => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'), admin_token => hiera('CONFIG_KEYSTONE_ADMIN_TOKEN'),
admin_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'), admin_password => hiera('CONFIG_KEYSTONE_ADMIN_PW'),
database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone", database_connection => "mysql+pymysql://keystone_admin:${keystone_cfg_ks_db_pw}@${keystone_cfg_mariadb_host}/keystone",
token_provider => "${keystone_token_provider_str}", token_provider => "${keystone_token_provider_str}",
enable_fernet_setup => true, enable_fernet_setup => true,
debug => hiera('CONFIG_DEBUG_MODE'),
service_name => 'httpd', service_name => 'httpd',
enable_ssl => $keystone_use_ssl, enable_ssl => $keystone_use_ssl,
public_bind_host => $bind_host, public_bind_host => $bind_host,

5
packstack/puppet/modules/packstack/manifests/manila/rabbitmq.pp
View File

@@ -23,10 +23,13 @@ class packstack::manila::rabbitmq ()
$db_pw = hiera('CONFIG_MANILA_DB_PW') $db_pw = hiera('CONFIG_MANILA_DB_PW')
$mariadb_host = hiera('CONFIG_MARIADB_HOST_URL') $mariadb_host = hiera('CONFIG_MARIADB_HOST_URL')
class { '::manila::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::manila': class { '::manila':
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'), rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/", default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
sql_connection => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila", sql_connection => "mysql+pymysql://manila:${db_pw}@${mariadb_host}/manila",
debug => hiera('CONFIG_DEBUG_MODE'),
} }
} }

4
packstack/puppet/modules/packstack/manifests/neutron/rabbitmq.pp
View File

@@ -25,6 +25,9 @@ class packstack::neutron::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'neutron-service' |> File[$files_to_set_owner] ~> Service<| tag == 'neutron-service' |>
} }
class { '::neutron::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::neutron': class { '::neutron':
bind_host => $bind_host, bind_host => $bind_host,
@@ -33,7 +36,6 @@ class packstack::neutron::rabbitmq ()
core_plugin => hiera('CONFIG_NEUTRON_CORE_PLUGIN'), core_plugin => hiera('CONFIG_NEUTRON_CORE_PLUGIN'),
allow_overlapping_ips => true, allow_overlapping_ips => true,
service_plugins => hiera_array('SERVICE_PLUGINS'), service_plugins => hiera_array('SERVICE_PLUGINS'),
debug => hiera('CONFIG_DEBUG_MODE'),
kombu_ssl_ca_certs => $kombu_ssl_ca_certs, kombu_ssl_ca_certs => $kombu_ssl_ca_certs,
kombu_ssl_keyfile => $kombu_ssl_keyfile, kombu_ssl_keyfile => $kombu_ssl_keyfile,
kombu_ssl_certfile => $kombu_ssl_certfile, kombu_ssl_certfile => $kombu_ssl_certfile,

5
packstack/puppet/modules/packstack/manifests/nova.pp
View File

@@ -57,11 +57,14 @@ class packstack::nova ()
$key = undef $key = undef
} }
class { '::nova::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::nova': class { '::nova':
glance_api_servers => "http://${nova_common_rabbitmq_cfg_storage_host}:9292", glance_api_servers => "http://${nova_common_rabbitmq_cfg_storage_host}:9292",
default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/", default_transport_url => "rabbit://${rabbit_userid}:${rabbit_password}@${rabbit_host}:${rabbit_port}/",
rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'), rabbit_use_ssl => hiera('CONFIG_AMQP_SSL_ENABLED'),
debug => hiera('CONFIG_DEBUG_MODE'),
nova_public_key => $public_key, nova_public_key => $public_key,
nova_private_key => $private_key, nova_private_key => $private_key,
kombu_ssl_ca_certs => $kombu_ssl_ca_certs, kombu_ssl_ca_certs => $kombu_ssl_ca_certs,

5
packstack/puppet/modules/packstack/manifests/nova/ceilometer/rabbitmq.pp
View File

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

5
packstack/puppet/modules/packstack/manifests/sahara/rabbitmq.pp
View File

@@ -23,10 +23,13 @@ class packstack::sahara::rabbitmq ()
File[$files_to_set_owner] ~> Service<| tag == 'sahara-service' |> File[$files_to_set_owner] ~> Service<| tag == 'sahara-service' |>
} }
class { '::sahara::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::sahara': class { '::sahara':
database_connection => database_connection =>
"mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara", "mysql+pymysql://sahara:${sahara_cfg_sahara_db_pw}@${sahara_cfg_sahara_mariadb_host}/sahara",
debug => hiera('CONFIG_DEBUG_MODE'),
admin_user => 'sahara', admin_user => 'sahara',
admin_password => hiera('CONFIG_SAHARA_KS_PW'), admin_password => hiera('CONFIG_SAHARA_KS_PW'),
admin_tenant_name => 'services', admin_tenant_name => 'services',

5
packstack/puppet/modules/packstack/manifests/trove.pp
View File

@@ -13,13 +13,16 @@ class packstack::trove ()
auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'), auth_url => hiera('CONFIG_KEYSTONE_PUBLIC_URL_VERSIONLESS'),
} }
class { '::trove::logging':
debug => hiera('CONFIG_DEBUG_MODE'),
}
class { '::trove::api': class { '::trove::api':
bind_host => $bind_host, bind_host => $bind_host,
enabled => true, enabled => true,
cert_file => false, cert_file => false,
key_file => false, key_file => false,
ca_file => false, ca_file => false,
debug => hiera('CONFIG_DEBUG_MODE'),
workers => hiera('CONFIG_SERVICE_WORKERS'), workers => hiera('CONFIG_SERVICE_WORKERS'),
} }