From ed9298e9968369453e770240dc847899ee32e9e4 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:06:03 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: I9ff8d888e367a46ab89e3668bf4ba76c4c7c127c --- examples/glance_multi_store.pp | 6 +++--- examples/glance_single_store.pp | 4 ++-- manifests/api.pp | 12 ++++++------ manifests/api/authtoken.pp | 2 +- manifests/api/db.pp | 2 +- manifests/api/logging.pp | 2 +- manifests/backend/cinder.pp | 2 +- manifests/backend/file.pp | 2 +- manifests/backend/multistore/cinder.pp | 2 +- manifests/backend/multistore/file.pp | 2 +- manifests/backend/multistore/rbd.pp | 4 ++-- manifests/backend/multistore/swift.pp | 4 ++-- manifests/backend/multistore/vsphere.pp | 2 +- manifests/backend/rbd.pp | 4 ++-- manifests/backend/swift.pp | 4 ++-- manifests/backend/vsphere.pp | 2 +- manifests/cache/cleaner.pp | 4 ++-- manifests/cache/logging.pp | 2 +- manifests/cache/pruner.pp | 4 ++-- manifests/client.pp | 4 ++-- manifests/config.pp | 2 +- manifests/db/metadefs.pp | 4 ++-- manifests/db/mysql.pp | 2 +- manifests/db/postgresql.pp | 2 +- manifests/db/sync.pp | 2 +- manifests/init.pp | 4 ++-- manifests/keystone/auth.pp | 2 +- manifests/notify/rabbitmq.pp | 2 +- manifests/params.pp | 2 +- manifests/policy.pp | 4 ++-- manifests/registry.pp | 6 +++--- manifests/registry/authtoken.pp | 2 +- manifests/registry/db.pp | 2 +- manifests/registry/logging.pp | 2 +- spec/acceptance/basic_glance_spec.rb | 10 +++++----- spec/classes/glance_api_spec.rb | 2 +- spec/classes/glance_backend_swift_spec.rb | 2 +- spec/classes/glance_keystone_auth_spec.rb | 2 +- spec/defines/glance_backend_multistore_swift_spec.rb | 2 +- 39 files changed, 63 insertions(+), 63 deletions(-) diff --git a/examples/glance_multi_store.pp b/examples/glance_multi_store.pp index 4983f283..066f8c22 100644 --- a/examples/glance_multi_store.pp +++ b/examples/glance_multi_store.pp @@ -7,17 +7,17 @@ # default_store is set at that point, then the first store in the list 'stores' # provided will be made the default). -class { '::glance::backend::file': +class { 'glance::backend::file': multi_store => true, } -class { '::glance::backend::swift': +class { 'glance::backend::swift': swift_store_user => 'demo', swift_store_key => 'secrete', multi_store => true, } -class { '::glance::api': +class { 'glance::api': keystone_password => 'a_big_secret', stores => ['file', 'swift'], default_store => 'swift', diff --git a/examples/glance_single_store.pp b/examples/glance_single_store.pp index 2ca2d3f6..111f75d4 100644 --- a/examples/glance_single_store.pp +++ b/examples/glance_single_store.pp @@ -7,12 +7,12 @@ # or it will attempt to override the default set by the backend class and result # in an error. -class { '::glance::backend::swift': +class { 'glance::backend::swift': swift_store_user => 'demo', swift_store_key => 'secrete', } -class { '::glance::api': +class { 'glance::api': keystone_password => 'a_big_secret', stores => ['swift'], } diff --git a/manifests/api.pp b/manifests/api.pp index dd319cbf..24af911d 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -387,13 +387,13 @@ class glance::api( $multi_store = false, ) inherits glance { - include ::glance::deps - include ::glance::policy - include ::glance::api::db + include glance::deps + include glance::policy + include glance::api::db if $sync_db { - include ::glance::db::sync - include ::glance::db::metadefs + include glance::db::sync + include glance::db::metadefs } if ( $glance::params::api_package_name != $glance::params::registry_package_name ) { @@ -597,7 +597,7 @@ enabled_backends instead.') # keystone config if $auth_strategy == 'keystone' { - include ::glance::api::authtoken + include glance::api::authtoken } oslo::middleware { 'glance_api_config': diff --git a/manifests/api/authtoken.pp b/manifests/api/authtoken.pp index 57afb86b..c9a0d690 100644 --- a/manifests/api/authtoken.pp +++ b/manifests/api/authtoken.pp @@ -214,7 +214,7 @@ class glance::api::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::glance::deps + include glance::deps if is_service_default($password) { fail('Please set password for Glance service user') diff --git a/manifests/api/db.pp b/manifests/api/db.pp index 705f561f..4181f107 100644 --- a/manifests/api/db.pp +++ b/manifests/api/db.pp @@ -62,7 +62,7 @@ class glance::api::db ( $database_idle_timeout = undef, ) { - include ::glance::deps + include glance::deps if $database_idle_timeout { warning('The database_idle_timeout parameter is deprecated. Please use \ diff --git a/manifests/api/logging.pp b/manifests/api/logging.pp index 52983772..6203b973 100644 --- a/manifests/api/logging.pp +++ b/manifests/api/logging.pp @@ -120,7 +120,7 @@ class glance::api::logging( $log_date_format = $::os_service_default, ) { - include ::glance::deps + include glance::deps oslo::log { 'glance_api_config': debug => $debug, diff --git a/manifests/backend/cinder.pp b/manifests/backend/cinder.pp index 3800ebde..eb999253 100644 --- a/manifests/backend/cinder.pp +++ b/manifests/backend/cinder.pp @@ -86,7 +86,7 @@ class glance::backend::cinder( $multi_store = false, ) { - include ::glance::deps + include glance::deps warning('glance::backend::cinder is deprecated. Use glance::backend::multistore::cinder instead.') diff --git a/manifests/backend/file.pp b/manifests/backend/file.pp index 9871868c..2d62c225 100644 --- a/manifests/backend/file.pp +++ b/manifests/backend/file.pp @@ -18,7 +18,7 @@ class glance::backend::file( $multi_store = false, ) { - include ::glance::deps + include glance::deps warning('glance::backend::file is deprecated. Use glance::backend::multistore::file instead.') diff --git a/manifests/backend/multistore/cinder.pp b/manifests/backend/multistore/cinder.pp index 5cc27581..a92a6132 100644 --- a/manifests/backend/multistore/cinder.pp +++ b/manifests/backend/multistore/cinder.pp @@ -84,7 +84,7 @@ define glance::backend::multistore::cinder( $store_description = $::os_service_default, ) { - include ::glance::deps + include glance::deps glance_api_config { "${name}/cinder_api_insecure": value => $cinder_api_insecure; diff --git a/manifests/backend/multistore/file.pp b/manifests/backend/multistore/file.pp index 177875e8..69c64aab 100644 --- a/manifests/backend/multistore/file.pp +++ b/manifests/backend/multistore/file.pp @@ -33,7 +33,7 @@ define glance::backend::multistore::file( $store_description = $::os_service_default, ) { - include ::glance::deps + include glance::deps glance_api_config { "${name}/filesystem_store_datadir": value => $filesystem_store_datadir; diff --git a/manifests/backend/multistore/rbd.pp b/manifests/backend/multistore/rbd.pp index 9b9f7556..b20880d2 100644 --- a/manifests/backend/multistore/rbd.pp +++ b/manifests/backend/multistore/rbd.pp @@ -63,8 +63,8 @@ define glance::backend::multistore::rbd( $store_description = $::os_service_default, ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params glance_api_config { "${name}/rbd_store_ceph_conf": value => $rbd_store_ceph_conf; diff --git a/manifests/backend/multistore/swift.pp b/manifests/backend/multistore/swift.pp index 3242c1e0..f188ca9b 100644 --- a/manifests/backend/multistore/swift.pp +++ b/manifests/backend/multistore/swift.pp @@ -93,8 +93,8 @@ define glance::backend::multistore::swift( $store_description = $::os_service_default, ) { - include ::glance::deps - include ::swift::client + include glance::deps + include swift::client Class['swift::client'] -> Anchor['glance::install::end'] Service<| tag == 'swift-service' |> -> Service['glance-api'] diff --git a/manifests/backend/multistore/vsphere.pp b/manifests/backend/multistore/vsphere.pp index a0ea9a8d..5f8b118a 100644 --- a/manifests/backend/multistore/vsphere.pp +++ b/manifests/backend/multistore/vsphere.pp @@ -90,7 +90,7 @@ define glance::backend::multistore::vsphere( $store_description = $::os_service_default, ) { - include ::glance::deps + include glance::deps glance_api_config { "${name}/vmware_insecure": value => $vmware_insecure; diff --git a/manifests/backend/rbd.pp b/manifests/backend/rbd.pp index f9bf8ad9..a0748912 100644 --- a/manifests/backend/rbd.pp +++ b/manifests/backend/rbd.pp @@ -47,8 +47,8 @@ class glance::backend::rbd( $multi_store = false, ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params warning('glance::backend::rbd is deprecated. Use glance::backend::multistore::rbd instead.') diff --git a/manifests/backend/swift.pp b/manifests/backend/swift.pp index 71469739..4b69873d 100644 --- a/manifests/backend/swift.pp +++ b/manifests/backend/swift.pp @@ -73,8 +73,8 @@ class glance::backend::swift( $multi_store = false, ) { - include ::glance::deps - include ::swift::client + include glance::deps + include swift::client warning('glance::backend::swift is deprecated. Use glance::backend::multistore::swift instead.') diff --git a/manifests/backend/vsphere.pp b/manifests/backend/vsphere.pp index 88dc2c01..18d003b7 100644 --- a/manifests/backend/vsphere.pp +++ b/manifests/backend/vsphere.pp @@ -91,7 +91,7 @@ class glance::backend::vsphere( $multi_store = false, ) { - include ::glance::deps + include glance::deps warning('glance::backend::vsphere is deprecated. Use glance::backend::multistore::vsphere instead.') diff --git a/manifests/cache/cleaner.pp b/manifests/cache/cleaner.pp index 4a8d379e..64a70d08 100644 --- a/manifests/cache/cleaner.pp +++ b/manifests/cache/cleaner.pp @@ -33,8 +33,8 @@ class glance::cache::cleaner( $command_options = '', ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params cron { 'glance-cache-cleaner': command => "${glance::params::cache_cleaner_command} ${command_options}", diff --git a/manifests/cache/logging.pp b/manifests/cache/logging.pp index 6c663882..1ae4afbc 100644 --- a/manifests/cache/logging.pp +++ b/manifests/cache/logging.pp @@ -114,7 +114,7 @@ class glance::cache::logging( $log_date_format = $::os_service_default, ) { - include ::glance::deps + include glance::deps oslo::log { 'glance_cache_config': debug => $debug, diff --git a/manifests/cache/pruner.pp b/manifests/cache/pruner.pp index 59566f07..7766c707 100644 --- a/manifests/cache/pruner.pp +++ b/manifests/cache/pruner.pp @@ -33,8 +33,8 @@ class glance::cache::pruner( $command_options = '', ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params cron { 'glance-cache-pruner': command => "${glance::params::cache_pruner_command} ${command_options}", diff --git a/manifests/client.pp b/manifests/client.pp index 53008580..89fa49f6 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -10,8 +10,8 @@ class glance::client( $ensure = 'present' ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params package { 'python-glanceclient': ensure => $ensure, diff --git a/manifests/config.pp b/manifests/config.pp index c64bfbe6..7d471066 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -47,7 +47,7 @@ class glance::config ( $image_import_config = {}, ) { - include ::glance::deps + include glance::deps validate_legacy(Hash, 'validate_hash', $api_config) validate_legacy(Hash, 'validate_hash', $api_paste_ini_config) diff --git a/manifests/db/metadefs.pp b/manifests/db/metadefs.pp index f512cb8f..0d29c65b 100644 --- a/manifests/db/metadefs.pp +++ b/manifests/db/metadefs.pp @@ -13,8 +13,8 @@ class glance::db::metadefs( $extra_params = '', ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params exec { 'glance-manage db_load_metadefs': command => "glance-manage ${extra_params} db_load_metadefs", diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index b66c313a..7c03c273 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -40,7 +40,7 @@ class glance::db::mysql( $collate = 'utf8_general_ci', ) { - include ::glance::deps + include glance::deps validate_legacy(String, 'validate_string', $password) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 85f6eb0f..4b0a991b 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -32,7 +32,7 @@ class glance::db::postgresql( $privileges = 'ALL', ) { - include ::glance::deps + include glance::deps ::openstacklib::db::postgresql { 'glance': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 184f7df8..8c579305 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -13,7 +13,7 @@ class glance::db::sync( $extra_params = '', ) { - include ::glance::deps + include glance::deps exec { 'glance-manage db_sync': command => "glance-manage ${extra_params} db_sync", diff --git a/manifests/init.pp b/manifests/init.pp index e556a51c..40fedf3c 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -13,8 +13,8 @@ class glance( $package_ensure = 'present' ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params if ( $glance::params::api_package_name == $glance::params::registry_package_name ) { package { $::glance::params::api_package_name : diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index e2c75d23..2ea9cda6 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -88,7 +88,7 @@ class glance::keystone::auth( $internal_url = 'http://127.0.0.1:9292', ) { - include ::glance::deps + include glance::deps if $configure_endpoint { Keystone_endpoint["${region}/${service_name}::${service_type}"] ~> Anchor['glance::service::begin'] diff --git a/manifests/notify/rabbitmq.pp b/manifests/notify/rabbitmq.pp index 9d5e6de1..a3fa1cc9 100644 --- a/manifests/notify/rabbitmq.pp +++ b/manifests/notify/rabbitmq.pp @@ -130,7 +130,7 @@ class glance::notify::rabbitmq( $notification_driver = $::os_service_default, ) { - include ::glance::deps + include glance::deps oslo::messaging::rabbit { ['glance_api_config', 'glance_registry_config']: rabbit_ha_queues => $rabbit_ha_queues, diff --git a/manifests/params.pp b/manifests/params.pp index 3478a03a..388d0b1b 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -1,7 +1,7 @@ # these parameters need to be accessed from several locations and # should be considered to be constant class glance::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $client_package_name = "python${pyvers}-glanceclient" diff --git a/manifests/policy.pp b/manifests/policy.pp index 44765dba..64945f81 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class glance::policy ( $policy_path = '/etc/glance/policy.json', ) { - include ::glance::deps - include ::glance::params + include glance::deps + include glance::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/registry.pp b/manifests/registry.pp index 100e1db9..46f3d41d 100644 --- a/manifests/registry.pp +++ b/manifests/registry.pp @@ -120,8 +120,8 @@ class glance::registry( $enable_v1_registry = false, ) inherits glance { - include ::glance::deps - include ::glance::registry::db + include glance::deps + include glance::registry::db if ( $glance::params::api_package_name != $glance::params::registry_package_name ) { ensure_packages($glance::params::registry_package_name, @@ -159,7 +159,7 @@ class glance::registry( # keystone config if $auth_strategy == 'keystone' { - include ::glance::registry::authtoken + include glance::registry::authtoken } # SSL Options diff --git a/manifests/registry/authtoken.pp b/manifests/registry/authtoken.pp index 870cfdb4..f4006587 100644 --- a/manifests/registry/authtoken.pp +++ b/manifests/registry/authtoken.pp @@ -214,7 +214,7 @@ class glance::registry::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::glance::deps + include glance::deps if is_service_default($password) { fail('Please set password for Glance service user') diff --git a/manifests/registry/db.pp b/manifests/registry/db.pp index b9364071..d509e02e 100644 --- a/manifests/registry/db.pp +++ b/manifests/registry/db.pp @@ -62,7 +62,7 @@ class glance::registry::db ( $database_idle_timeout = undef, ) { - include ::glance::deps + include glance::deps if $database_idle_timeout { warning('The database_idle_timeout parameter is deprecated. Please use \ diff --git a/manifests/registry/logging.pp b/manifests/registry/logging.pp index 6b1ce176..87bb3790 100644 --- a/manifests/registry/logging.pp +++ b/manifests/registry/logging.pp @@ -120,7 +120,7 @@ class glance::registry::logging( $log_date_format = $::os_service_default, ) { - include ::glance::deps + include glance::deps oslo::log { 'glance_registry_config': debug => $debug, diff --git a/spec/acceptance/basic_glance_spec.rb b/spec/acceptance/basic_glance_spec.rb index 21a31203..e94f968e 100644 --- a/spec/acceptance/basic_glance_spec.rb +++ b/spec/acceptance/basic_glance_spec.rb @@ -4,11 +4,11 @@ describe 'glance class' do context 'default parameters' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::mysql - include ::openstack_integration::keystone - include ::openstack_integration::glance + include openstack_integration + include openstack_integration::repos + include openstack_integration::mysql + include openstack_integration::keystone + include openstack_integration::glance glance_image { 'test_image': ensure => present, diff --git a/spec/classes/glance_api_spec.rb b/spec/classes/glance_api_spec.rb index 320c504c..fdf6b862 100644 --- a/spec/classes/glance_api_spec.rb +++ b/spec/classes/glance_api_spec.rb @@ -2,7 +2,7 @@ require 'spec_helper' describe 'glance::api' do let :pre_condition do - "class { '::glance::api::authtoken': + "class { 'glance::api::authtoken': password => 'ChangeMe', }" end diff --git a/spec/classes/glance_backend_swift_spec.rb b/spec/classes/glance_backend_swift_spec.rb index 9eb1c7ac..989f64ea 100644 --- a/spec/classes/glance_backend_swift_spec.rb +++ b/spec/classes/glance_backend_swift_spec.rb @@ -11,7 +11,7 @@ describe 'glance::backend::swift' do let :pre_condition do 'class { "glance::api::authtoken": password => "pass" } - include ::glance::api' + include glance::api' end describe 'when default parameters' do diff --git a/spec/classes/glance_keystone_auth_spec.rb b/spec/classes/glance_keystone_auth_spec.rb index 0cd5ec5a..6569db92 100644 --- a/spec/classes/glance_keystone_auth_spec.rb +++ b/spec/classes/glance_keystone_auth_spec.rb @@ -129,7 +129,7 @@ describe 'glance::keystone::auth' do describe 'when configuring glance-api and the keystone endpoint' do let :pre_condition do "class { 'glance::api::authtoken': password => 'test' } - include ::glance::api" + include glance::api" end let :params do diff --git a/spec/defines/glance_backend_multistore_swift_spec.rb b/spec/defines/glance_backend_multistore_swift_spec.rb index 71f358a0..47506fb6 100644 --- a/spec/defines/glance_backend_multistore_swift_spec.rb +++ b/spec/defines/glance_backend_multistore_swift_spec.rb @@ -31,7 +31,7 @@ describe 'glance::backend::multistore::swift' do let :pre_condition do 'class { "glance::api::authtoken": password => "pass" } - include ::glance::api' + include glance::api' end describe 'when default parameters' do