diff --git a/manifests/api/db.pp b/manifests/api/db.pp index 69a8ffa3..5d2308e4 100644 --- a/manifests/api/db.pp +++ b/manifests/api/db.pp @@ -43,8 +43,6 @@ class glance::api::db ( $database_max_overflow = $::os_service_default, ) { - include ::glance::params - # NOTE(degorenko): In order to keep backward compatibility we rely on the pick function # to use glance::api:: if glance::api::db:: isn't specified. $database_connection_real = pick($::glance::api::database_connection, $database_connection) @@ -58,44 +56,13 @@ class glance::api::db ( validate_re($database_connection_real, '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') - case $database_connection_real { - /^mysql(\+pymysql)?:\/\//: { - require 'mysql::bindings' - require 'mysql::bindings::python' - if $database_connection_real =~ /^mysql\+pymysql/ { - $backend_package = $::glance::params::pymysql_package_name - } else { - $backend_package = false - } - } - /^postgresql:\/\//: { - $backend_package = false - require 'postgresql::lib::python' - } - /^sqlite:\/\//: { - $backend_package = $::glance::params::sqlite_package_name - } - default: { - fail('Unsupported backend configured') - } + oslo::db { 'glance_api_config': + connection => $database_connection_real, + idle_timeout => $database_idle_timeout_real, + min_pool_size => $database_min_pool_size_real, + max_retries => $database_max_retries_real, + retry_interval => $database_retry_interval_real, + max_pool_size => $database_max_pool_size_real, + max_overflow => $database_max_overflow_real, } - - if $backend_package and !defined(Package[$backend_package]) { - package {'glance-backend-package': - ensure => present, - name => $backend_package, - tag => 'openstack', - } - } - - glance_api_config { - 'database/connection': value => $database_connection_real, secret => true; - 'database/idle_timeout': value => $database_idle_timeout_real; - 'database/min_pool_size': value => $database_min_pool_size_real; - 'database/max_retries': value => $database_max_retries_real; - 'database/retry_interval': value => $database_retry_interval_real; - 'database/max_pool_size': value => $database_max_pool_size_real; - 'database/max_overflow': value => $database_max_overflow_real; - } - } diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp index 4fb4b621..a27889ca 100644 --- a/manifests/api/logging.pp +++ b/manifests/api/logging.pp @@ -27,11 +27,11 @@ # [*log_dir*] # (optional) Directory where logs should be stored. # If set to boolean false, it will not log to any directory. -# Defaults to '/var/log/glance' +# Defaults to '/var/log/glance'. # # [*log_file*] # (optional) File where logs should be stored. -# Defaults to '/var/log/glance/api.log' +# Defaults to '/var/log/glance/api.log'. # # [*logging_context_format_string*] # (optional) Format string to use for log messages with context. @@ -125,31 +125,25 @@ class glance::api::logging( $verbose_real = pick($::glance::api::verbose,$verbose) $debug_real = pick($::glance::api::debug,$debug) - if is_service_default($default_log_levels) { - $default_log_levels_real = $default_log_levels - } else { - $default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',') - } - - glance_api_config { - 'DEFAULT/debug': value => $debug_real; - 'DEFAULT/verbose': value => $verbose_real; - 'DEFAULT/use_stderr': value => $use_stderr_real; - 'DEFAULT/use_syslog': value => $use_syslog_real; - 'DEFAULT/log_dir': value => $log_dir_real; - 'DEFAULT/log_file': value => $log_file_real; - 'DEFAULT/syslog_log_facility': value => $log_facility_real; - 'DEFAULT/logging_context_format_string': value => $logging_context_format_string; - 'DEFAULT/logging_default_format_string': value => $logging_default_format_string; - 'DEFAULT/logging_debug_format_suffix': value => $logging_debug_format_suffix; - 'DEFAULT/logging_exception_prefix': value => $logging_exception_prefix; - 'DEFAULT/log_config_append': value => $log_config_append; - 'DEFAULT/default_log_levels': value => $default_log_levels_real; - 'DEFAULT/publish_errors': value => $publish_errors; - 'DEFAULT/fatal_deprecations': value => $fatal_deprecations; - 'DEFAULT/instance_format': value => $instance_format; - 'DEFAULT/instance_uuid_format': value => $instance_uuid_format; - 'DEFAULT/log_date_format': value => $log_date_format; + oslo::log { 'glance_api_config': + debug => $debug_real, + verbose => $verbose_real, + use_stderr => $use_stderr_real, + use_syslog => $use_syslog_real, + log_dir => $log_dir_real, + log_file => $log_file_real, + syslog_log_facility => $log_facility_real, + logging_context_format_string => $logging_context_format_string, + logging_default_format_string => $logging_default_format_string, + logging_debug_format_suffix => $logging_debug_format_suffix, + logging_exception_prefix => $logging_exception_prefix, + log_config_append => $log_config_append, + default_log_levels => $default_log_levels, + publish_errors => $publish_errors, + fatal_deprecations => $fatal_deprecations, + instance_format => $instance_format, + instance_uuid_format => $instance_uuid_format, + log_date_format => $log_date_format, } } diff --git a/manifests/cache/logging.pp b/manifests/cache/logging.pp index 3d1a8788..bb844ef4 100644 --- a/manifests/cache/logging.pp +++ b/manifests/cache/logging.pp @@ -122,30 +122,25 @@ class glance::cache::logging( $verbose_real = pick($::glance::api::verbose,$verbose) $debug_real = pick($::glance::api::debug,$debug) - if is_service_default($default_log_levels) { - $default_log_levels_real = $default_log_levels - } else { - $default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',') + oslo::log { 'glance_cache_config': + debug => $debug_real, + verbose => $verbose_real, + use_stderr => $use_stderr_real, + use_syslog => $use_syslog_real, + log_dir => $log_dir_real, + log_file => $log_file, + syslog_log_facility => $log_facility_real, + logging_context_format_string => $logging_context_format_string, + logging_default_format_string => $logging_default_format_string, + logging_debug_format_suffix => $logging_debug_format_suffix, + logging_exception_prefix => $logging_exception_prefix, + log_config_append => $log_config_append, + default_log_levels => $default_log_levels, + publish_errors => $publish_errors, + fatal_deprecations => $fatal_deprecations, + instance_format => $instance_format, + instance_uuid_format => $instance_uuid_format, + log_date_format => $log_date_format, } - glance_cache_config { - 'DEFAULT/debug': value => $debug_real; - 'DEFAULT/verbose': value => $verbose_real; - 'DEFAULT/use_stderr': value => $use_stderr_real; - 'DEFAULT/use_syslog': value => $use_syslog_real; - 'DEFAULT/log_dir': value => $log_dir_real; - 'DEFAULT/log_file': value => $log_file; - 'DEFAULT/syslog_log_facility': value => $log_facility_real; - 'DEFAULT/logging_context_format_string': value => $logging_context_format_string; - 'DEFAULT/logging_default_format_string': value => $logging_default_format_string; - 'DEFAULT/logging_debug_format_suffix': value => $logging_debug_format_suffix; - 'DEFAULT/logging_exception_prefix': value => $logging_exception_prefix; - 'DEFAULT/log_config_append': value => $log_config_append; - 'DEFAULT/default_log_levels': value => $default_log_levels_real; - 'DEFAULT/publish_errors': value => $publish_errors; - 'DEFAULT/fatal_deprecations': value => $fatal_deprecations; - 'DEFAULT/instance_format': value => $instance_format; - 'DEFAULT/instance_uuid_format': value => $instance_uuid_format; - 'DEFAULT/log_date_format': value => $log_date_format; - } } diff --git a/manifests/glare/db.pp b/manifests/glare/db.pp index 053ce435..10c94557 100644 --- a/manifests/glare/db.pp +++ b/manifests/glare/db.pp @@ -43,49 +43,17 @@ class glance::glare::db ( $database_max_overflow = $::os_service_default, ) { - include ::glance::params - validate_re($database_connection, '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') - case $database_connection { - /^mysql(\+pymysql)?:\/\//: { - require 'mysql::bindings' - require 'mysql::bindings::python' - if $database_connection =~ /^mysql\+pymysql/ { - $backend_package = $::glance::params::pymysql_package_name - } else { - $backend_package = false - } - } - /^postgresql:\/\//: { - $backend_package = false - require 'postgresql::lib::python' - } - /^sqlite:\/\//: { - $backend_package = $::glance::params::sqlite_package_name - } - default: { - fail('Unsupported backend configured') - } - } - - if $backend_package and !defined(Package[$backend_package]) { - package {'glance-backend-package': - ensure => present, - name => $backend_package, - tag => 'openstack', - } - } - - glance_glare_config { - 'database/connection': value => $database_connection, secret => true; - 'database/idle_timeout': value => $database_idle_timeout; - 'database/min_pool_size': value => $database_min_pool_size; - 'database/max_retries': value => $database_max_retries; - 'database/retry_interval': value => $database_retry_interval; - 'database/max_pool_size': value => $database_max_pool_size; - 'database/max_overflow': value => $database_max_overflow; + oslo::db { 'glance_glare_config': + connection => $database_connection, + idle_timeout => $database_idle_timeout, + min_pool_size => $database_min_pool_size, + max_retries => $database_max_retries, + retry_interval => $database_retry_interval, + max_pool_size => $database_max_pool_size, + max_overflow => $database_max_overflow, } } diff --git a/manifests/glare/logging.pp b/manifests/glare/logging.pp index 2858cb67..d4dbec49 100644 --- a/manifests/glare/logging.pp +++ b/manifests/glare/logging.pp @@ -115,31 +115,25 @@ class glance::glare::logging( $log_date_format = $::os_service_default, ) { - if is_service_default($default_log_levels) { - $default_log_levels_real = $default_log_levels - } else { - $default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',') - } - - glance_glare_config { - 'DEFAULT/debug': value => $debug; - 'DEFAULT/verbose': value => $verbose; - 'DEFAULT/use_stderr': value => $use_stderr; - 'DEFAULT/use_syslog': value => $use_syslog; - 'DEFAULT/log_dir': value => $log_dir; - 'DEFAULT/log_file': value => $log_file; - 'DEFAULT/syslog_log_facility': value => $log_facility; - 'DEFAULT/default_log_levels': value => $default_log_levels_real; - 'DEFAULT/logging_context_format_string': value => $logging_context_format_string; - 'DEFAULT/logging_default_format_string': value => $logging_default_format_string; - 'DEFAULT/logging_debug_format_suffix': value => $logging_debug_format_suffix; - 'DEFAULT/logging_exception_prefix': value => $logging_exception_prefix; - 'DEFAULT/log_config_append': value => $log_config_append; - 'DEFAULT/publish_errors': value => $publish_errors; - 'DEFAULT/fatal_deprecations': value => $fatal_deprecations; - 'DEFAULT/instance_format': value => $instance_format; - 'DEFAULT/instance_uuid_format': value => $instance_uuid_format; - 'DEFAULT/log_date_format': value => $log_date_format; + oslo::log { 'glance_glare_config': + debug => $debug, + verbose => $verbose, + use_stderr => $use_stderr, + use_syslog => $use_syslog, + log_dir => $log_dir, + log_file => $log_file, + syslog_log_facility => $log_facility, + logging_context_format_string => $logging_context_format_string, + logging_default_format_string => $logging_default_format_string, + logging_debug_format_suffix => $logging_debug_format_suffix, + logging_exception_prefix => $logging_exception_prefix, + log_config_append => $log_config_append, + default_log_levels => $default_log_levels, + publish_errors => $publish_errors, + fatal_deprecations => $fatal_deprecations, + instance_format => $instance_format, + instance_uuid_format => $instance_uuid_format, + log_date_format => $log_date_format, } } diff --git a/manifests/params.pp b/manifests/params.pp index 4cdbdabf..20548773 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -20,8 +20,6 @@ class glance::params { } else { $pyceph_package_name = 'python-rbd' } - $sqlite_package_name = undef - $pymysql_package_name = undef } 'Debian': { $api_package_name = 'glance-api' @@ -31,8 +29,6 @@ class glance::params { $glare_service_name = 'glance-glare' $registry_service_name = 'glance-registry' $pyceph_package_name = 'python-ceph' - $sqlite_package_name = 'python-pysqlite2' - $pymysql_package_name = 'python-pymysql' } default: { fail("Unsupported osfamily: ${::osfamily} operatingsystem: ${::operatingsystem}, module ${module_name} only support osfamily RedHat and Debian") diff --git a/manifests/policy.pp b/manifests/policy.pp index 4edb4617..1722eda7 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -36,4 +36,6 @@ class glance::policy( create_resources('openstacklib::policy::base', $policies) + oslo::policy { ['glance_api_config', 'glance_registry_config']: policy_file => $policy_path } + } diff --git a/manifests/registry/db.pp b/manifests/registry/db.pp index b0d85402..d6fdffd1 100644 --- a/manifests/registry/db.pp +++ b/manifests/registry/db.pp @@ -43,8 +43,6 @@ class glance::registry::db ( $database_max_overflow = $::os_service_default, ) { - include ::glance::params - # NOTE(degorenko): In order to keep backward compatibility we rely on the pick function # to use glance::registry:: if glance::registry::db:: isn't specified. $database_connection_real = pick($::glance::registry::database_connection, $database_connection) @@ -58,44 +56,13 @@ class glance::registry::db ( validate_re($database_connection_real, '^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?') - case $database_connection_real { - /^mysql(\+pymysql)?:\/\//: { - require 'mysql::bindings' - require 'mysql::bindings::python' - if $database_connection_real =~ /^mysql\+pymysql/ { - $backend_package = $::glance::params::pymysql_package_name - } else { - $backend_package = false - } - } - /^postgresql:\/\//: { - $backend_package = false - require 'postgresql::lib::python' - } - /^sqlite:\/\//: { - $backend_package = $::glance::params::sqlite_package_name - } - default: { - fail('Unsupported backend configured') - } + oslo::db { 'glance_registry_config': + connection => $database_connection_real, + idle_timeout => $database_idle_timeout_real, + min_pool_size => $database_min_pool_size_real, + max_retries => $database_max_retries_real, + retry_interval => $database_retry_interval_real, + max_pool_size => $database_max_pool_size_real, + max_overflow => $database_max_overflow_real, } - - if $backend_package and !defined(Package[$backend_package]) { - package {'glance-backend-package': - ensure => present, - name => $backend_package, - tag => 'openstack', - } - } - - glance_registry_config { - 'database/connection': value => $database_connection_real, secret => true; - 'database/idle_timeout': value => $database_idle_timeout_real; - 'database/min_pool_size': value => $database_min_pool_size_real; - 'database/max_retries': value => $database_max_retries_real; - 'database/retry_interval': value => $database_retry_interval_real; - 'database/max_pool_size': value => $database_max_pool_size_real; - 'database/max_overflow': value => $database_max_overflow_real; - } - } diff --git a/manifests/registry/logging.pp b/manifests/registry/logging.pp index ec5f3288..f40617e2 100644 --- a/manifests/registry/logging.pp +++ b/manifests/registry/logging.pp @@ -6,63 +6,63 @@ # # [*verbose*] # (Optional) Should the daemons log verbose messages -# Defaults to 'false' +# Defaults to $::os_service_default. # # [*debug*] # (Optional) Should the daemons log debug messages -# Defaults to 'false' +# Defaults to $::os_service_default. # # [*use_syslog*] # (Optional) Use syslog for logging. -# Defaults to 'false' +# Defaults to $::os_service_default. # # [*use_stderr*] # (optional) Use stderr for logging -# Defaults to 'true' +# Defaults to $::os_service_default. # # [*log_facility*] # (Optional) Syslog facility to receive log lines. -# Defaults to 'LOG_USER' +# Defaults to $::os_service_default. # # [*log_dir*] # (optional) Directory where logs should be stored. # If set to boolean false, it will not log to any directory. -# Defaults to '/var/log/glance' +# Defaults to '/var/log/glance'. # # [*log_file*] # (optional) File where logs should be stored. -# Defaults to '/var/log/glance/registry.log' +# Defaults to '/var/log/glance/registry.log'. # # [*logging_context_format_string*] # (optional) Format string to use for log messages with context. -# Defaults to undef. +# Defaults to $::os_service_default. # Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ # [%(request_id)s %(user_identity)s] %(instance)s%(message)s' # # [*logging_default_format_string*] # (optional) Format string to use for log messages without context. -# Defaults to undef. +# Defaults to $::os_service_default. # Example: '%(asctime)s.%(msecs)03d %(process)d %(levelname)s %(name)s\ # [-] %(instance)s%(message)s' # # [*logging_debug_format_suffix*] # (optional) Formatted data to append to log format when level is DEBUG. -# Defaults to undef. +# Defaults to $::os_service_default. # Example: '%(funcName)s %(pathname)s:%(lineno)d' # # [*logging_exception_prefix*] # (optional) Prefix each line of exception output with this format. -# Defaults to undef. +# Defaults to $::os_service_default. # Example: '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s' # # [*log_config_append*] # The name of an additional logging configuration file. -# Defaults to undef. +# Defaults to $::os_service_default. # See https://docs.python.org/2/howto/logging.html # # [*default_log_levels*] # (optional) Hash of logger (keys) and level (values) pairs. -# Defaults to undef. +# Defaults to $::os_service_default. # Example: # { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', # 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', @@ -71,27 +71,27 @@ # # [*publish_errors*] # (optional) Publish error events (boolean value). -# Defaults to undef (false if unconfigured). +# Defaults to $::os_service_default (false if unconfigured). # # [*fatal_deprecations*] # (optional) Make deprecations fatal (boolean value) -# Defaults to undef (false if unconfigured). +# Defaults to $::os_service_default (false if unconfigured). # # [*instance_format*] # (optional) If an instance is passed with the log message, format it # like this (string value). -# Defaults to undef. +# Defaults to $::os_service_default. # Example: '[instance: %(uuid)s] ' # # [*instance_uuid_format*] # (optional) If an instance UUID is passed with the log message, format # it like this (string value). -# Defaults to undef. +# Defaults to $::os_service_default. # Example: instance_uuid_format='[instance: %(uuid)s] ' # # [*log_date_format*] # (optional) Format string for %%(asctime)s in log records. -# Defaults to undef. +# Defaults to $::os_service_default. # Example: 'Y-%m-%d %H:%M:%S' class glance::registry::logging( @@ -125,31 +125,25 @@ class glance::registry::logging( $verbose_real = pick($::glance::registry::verbose,$verbose) $debug_real = pick($::glance::registry::debug,$debug) - if is_service_default($default_log_levels) { - $default_log_levels_real = $default_log_levels - } else { - $default_log_levels_real = join(sort(join_keys_to_values($default_log_levels, '=')), ',') - } - - glance_registry_config { - 'DEFAULT/debug': value => $debug_real; - 'DEFAULT/verbose': value => $verbose_real; - 'DEFAULT/use_stderr': value => $use_stderr_real; - 'DEFAULT/use_syslog': value => $use_syslog_real; - 'DEFAULT/log_dir': value => $log_dir_real; - 'DEFAULT/log_file': value => $log_file_real; - 'DEFAULT/syslog_log_facility': value => $log_facility_real; - 'DEFAULT/logging_context_format_string': value => $logging_context_format_string; - 'DEFAULT/logging_default_format_string': value => $logging_default_format_string; - 'DEFAULT/logging_debug_format_suffix': value => $logging_debug_format_suffix; - 'DEFAULT/logging_exception_prefix': value => $logging_exception_prefix; - 'DEFAULT/log_config_append': value => $log_config_append; - 'DEFAULT/default_log_levels': value => $default_log_levels_real; - 'DEFAULT/publish_errors': value => $publish_errors; - 'DEFAULT/fatal_deprecations': value => $fatal_deprecations; - 'DEFAULT/instance_format': value => $instance_format; - 'DEFAULT/instance_uuid_format': value => $instance_uuid_format; - 'DEFAULT/log_date_format': value => $log_date_format; + oslo::log { 'glance_registry_config': + debug => $debug_real, + verbose => $verbose_real, + use_stderr => $use_stderr_real, + use_syslog => $use_syslog_real, + log_dir => $log_dir_real, + log_file => $log_file_real, + syslog_log_facility => $log_facility_real, + logging_context_format_string => $logging_context_format_string, + logging_default_format_string => $logging_default_format_string, + logging_debug_format_suffix => $logging_debug_format_suffix, + logging_exception_prefix => $logging_exception_prefix, + log_config_append => $log_config_append, + default_log_levels => $default_log_levels, + publish_errors => $publish_errors, + fatal_deprecations => $fatal_deprecations, + instance_format => $instance_format, + instance_uuid_format => $instance_uuid_format, + log_date_format => $log_date_format, } } diff --git a/releasenotes/notes/switch_to_oslo_everywhere-01030871f9549110.yaml b/releasenotes/notes/switch_to_oslo_everywhere-01030871f9549110.yaml new file mode 100644 index 00000000..c227325a --- /dev/null +++ b/releasenotes/notes/switch_to_oslo_everywhere-01030871f9549110.yaml @@ -0,0 +1,4 @@ +--- +features: + - Configure database, logging and policy parameters for api, + registry and glare services from oslo defines. diff --git a/spec/classes/glance_api_db_spec.rb b/spec/classes/glance_api_db_spec.rb index aba9fd11..d8ea2ad7 100644 --- a/spec/classes/glance_api_db_spec.rb +++ b/spec/classes/glance_api_db_spec.rb @@ -44,7 +44,7 @@ describe 'glance::api::db' do context 'with incorrect pymysql database_connection string' do let :params do - { :database_connection => 'foo+pymysql://glance_api:glance@localhost/glance', } + { :database_connection => 'foo+pymysql://glance_api:glance@localhost/glance', } end it_raises 'a Puppet::Error', /validate_re/ @@ -55,11 +55,11 @@ describe 'glance::api::db' do shared_examples_for 'glance::api::db Debian' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', } + { :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', } end it 'install the proper backend package' do - is_expected.to contain_package('glance-backend-package').with( + is_expected.to contain_package('db_backend_package').with( :ensure => 'present', :name => 'python-pymysql', :tag => 'openstack' @@ -71,10 +71,10 @@ describe 'glance::api::db' do shared_examples_for 'glance::api::db RedHat' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', } + { :database_connection => 'mysql+pymysql://glance_api:glance@localhost/glance', } end - it { is_expected.not_to contain_package('glance-backend-package') } + it { is_expected.not_to contain_package('db_backend_package') } end end diff --git a/spec/classes/glance_api_logging_spec.rb b/spec/classes/glance_api_logging_spec.rb index 1d25e969..a46a61ae 100644 --- a/spec/classes/glance_api_logging_spec.rb +++ b/spec/classes/glance_api_logging_spec.rb @@ -15,7 +15,7 @@ describe 'glance::api::logging' do :logging_exception_prefix => '%(asctime)s.%(msecs)03d %(process)d TRACE %(name)s %(instance)s', :log_config_append => '/etc/glance/logging.conf', :publish_errors => true, - :default_log_levels => { + :default_log_levels => { 'amqp' => 'WARN', 'amqplib' => 'WARN', 'boto' => 'WARN', 'qpid' => 'WARN', 'sqlalchemy' => 'WARN', 'suds' => 'INFO', 'iso8601' => 'WARN', diff --git a/spec/classes/glance_glare_db_spec.rb b/spec/classes/glance_glare_db_spec.rb index 20f157cc..fda8e14f 100644 --- a/spec/classes/glance_glare_db_spec.rb +++ b/spec/classes/glance_glare_db_spec.rb @@ -55,11 +55,11 @@ describe 'glance::glare::db' do shared_examples_for 'glance::glare::db Debian' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://glance_glare:glance@localhost/glance', } + { :database_connection => 'mysql+pymysql://glance_glare:glance@localhost/glance', } end it 'install the proper backend package' do - is_expected.to contain_package('glance-backend-package').with( + is_expected.to contain_package('db_backend_package').with( :ensure => 'present', :name => 'python-pymysql', :tag => 'openstack' @@ -71,10 +71,10 @@ describe 'glance::glare::db' do shared_examples_for 'glance::glare::db RedHat' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://glance_glare:glance@localhost/glance', } + { :database_connection => 'mysql+pymysql://glance_glare:glance@localhost/glance', } end - it { is_expected.not_to contain_package('glance-backend-package') } + it { is_expected.not_to contain_package('db_backend_package') } end end diff --git a/spec/classes/glance_registry_db_spec.rb b/spec/classes/glance_registry_db_spec.rb index 7a9c9f60..50d41118 100644 --- a/spec/classes/glance_registry_db_spec.rb +++ b/spec/classes/glance_registry_db_spec.rb @@ -44,7 +44,7 @@ describe 'glance::registry::db' do context 'with incorrect pymysql database_connection string' do let :params do - { :database_connection => 'foo+pymysql://glance_registry:glance@localhost/glance', } + { :database_connection => 'foo+pymysql://glance_registry:glance@localhost/glance', } end it_raises 'a Puppet::Error', /validate_re/ @@ -55,11 +55,11 @@ describe 'glance::registry::db' do shared_examples_for 'glance::registry::db Debian' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', } + { :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', } end it 'install the proper backend package' do - is_expected.to contain_package('glance-backend-package').with( + is_expected.to contain_package('db_backend_package').with( :ensure => 'present', :name => 'python-pymysql', :tag => 'openstack' @@ -71,10 +71,10 @@ describe 'glance::registry::db' do shared_examples_for 'glance::registry::db RedHat' do context 'using pymysql driver' do let :params do - { :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', } + { :database_connection => 'mysql+pymysql://glance_registry:glance@localhost/glance', } end - it { is_expected.not_to contain_package('glance-backend-package') } + it { is_expected.not_to contain_package('db_backend_package') } end end