From 1e5aac99cdd3208788ab9aae101a0086aaff6c6c Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:03:31 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: Ifd3d732aeb86e1c046f0164b5a008fd37356d34e --- examples/init.pp | 2 +- manifests/api.pp | 12 +++---- manifests/client.pp | 4 +-- manifests/config.pp | 2 +- manifests/db.pp | 2 +- manifests/db/mysql.pp | 2 +- manifests/db/postgresql.pp | 2 +- manifests/db/sync.pp | 2 +- manifests/init.pp | 8 ++--- manifests/keystone/auth.pp | 2 +- manifests/keystone/authtoken.pp | 2 +- manifests/logging.pp | 2 +- manifests/params.pp | 2 +- manifests/policy.pp | 4 +-- manifests/processor.pp | 4 +-- manifests/storage.pp | 2 +- manifests/ui.pp | 4 +-- manifests/wsgi/apache.pp | 10 +++--- .../acceptance/cloudkitty_wsgi_apache_spec.rb | 32 +++++++++---------- spec/classes/cloudkitty_api_spec.rb | 14 ++++---- 20 files changed, 57 insertions(+), 57 deletions(-) diff --git a/examples/init.pp b/examples/init.pp index da14ffa..5c32450 100644 --- a/examples/init.pp +++ b/examples/init.pp @@ -9,4 +9,4 @@ # Learn more about module testing here: # https://puppet.com/docs/puppet/latest/bgtm.html#testing-your-module # -include ::cloudkitty +include cloudkitty diff --git a/manifests/api.pp b/manifests/api.pp index a977cd7..696fc66 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -51,10 +51,10 @@ class cloudkitty::api ( $service_name = 'httpd', ) { - include ::cloudkitty - include ::cloudkitty::deps - include ::cloudkitty::params - include ::cloudkitty::policy + include cloudkitty + include cloudkitty::deps + include cloudkitty::params + include cloudkitty::policy package { 'cloudkitty-api': ensure => $package_ensure, @@ -71,11 +71,11 @@ class cloudkitty::api ( } if $sync_db { - include ::cloudkitty::db::sync + include cloudkitty::db::sync } if $service_name == 'httpd' { - include ::apache::params + include apache::params service { 'cloudkitty-api': ensure => 'stopped', name => $::cloudkitty::params::api_service_name, diff --git a/manifests/client.pp b/manifests/client.pp index db47532..082a849 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -12,8 +12,8 @@ class cloudkitty::client ( $ensure = 'present' ) { - include ::cloudkitty::deps - include ::cloudkitty::params + include cloudkitty::deps + include cloudkitty::params package { 'python-cloudkittyclient': ensure => $ensure, diff --git a/manifests/config.pp b/manifests/config.pp index ee0dc58..e49d0b6 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -28,7 +28,7 @@ class cloudkitty::config ( $cloudkitty_api_paste_ini = {}, ) { - include ::cloudkitty::deps + include cloudkitty::deps validate_legacy(Hash, 'validate_hash', $cloudkitty_config) validate_legacy(Hash, 'validate_hash', $cloudkitty_api_paste_ini) diff --git a/manifests/db.pp b/manifests/db.pp index be74af8..907f0d8 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -62,7 +62,7 @@ class cloudkitty::db ( $database_idle_timeout = undef, ) { - include ::cloudkitty::deps + include cloudkitty::deps validate_legacy(Oslo::Dbconn, 'validate_re', $database_connection, ['^(sqlite|mysql(\+pymysql)?|postgresql):\/\/(\S+:\S+@\S+\/\S+)?']) diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 52758a7..09f86a8 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -43,7 +43,7 @@ class cloudkitty::db::mysql( $allowed_hosts = undef ) { - include ::cloudkitty::deps + include cloudkitty::deps validate_legacy(String, 'validate_string', $password) diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index aa590f6..7e4eb80 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -32,7 +32,7 @@ class cloudkitty::db::postgresql( $privileges = 'ALL', ) { - include ::cloudkitty::deps + include cloudkitty::deps ::openstacklib::db::postgresql { 'cloudkitty': password_hash => postgresql_password($user, $password), diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 447b142..de77fb0 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -12,7 +12,7 @@ class cloudkitty::db::sync( $extra_params = undef, ) { - include ::cloudkitty::deps + include cloudkitty::deps exec { 'cloudkitty-db-sync': command => "cloudkitty-dbsync upgrade ${extra_params}", diff --git a/manifests/init.pp b/manifests/init.pp index 0f941ab..abea974 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -305,10 +305,10 @@ class cloudkitty( $keystone_version = '3', ) { - include ::cloudkitty::params - include ::cloudkitty::db - include ::cloudkitty::deps - include ::cloudkitty::storage + include cloudkitty::params + include cloudkitty::db + include cloudkitty::deps + include cloudkitty::storage package { 'cloudkitty-common': ensure => $package_ensure, diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 3860b82..6ce98fa 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -88,7 +88,7 @@ class cloudkitty::keystone::auth ( $rating_role = 'rating', ) { - include ::cloudkitty::deps + include cloudkitty::deps if $configure_user_role { Keystone_user_role["${auth_name}@${tenant}"] ~> Anchor['cloudkitty::config::end'] diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 6551f38..53e8f32 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -202,7 +202,7 @@ class cloudkitty::keystone::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::cloudkitty::deps + include cloudkitty::deps keystone::resource::authtoken { 'cloudkitty_config': username => $username, diff --git a/manifests/logging.pp b/manifests/logging.pp index 78ad30b..e7458ee 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -123,7 +123,7 @@ class cloudkitty::logging( $log_date_format = $::os_service_default, ) { - include ::cloudkitty::deps + include cloudkitty::deps oslo::log { 'cloudkitty_config': use_stderr => $use_stderr, diff --git a/manifests/params.pp b/manifests/params.pp index 8b740b8..eafd6bd 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,7 @@ # Parameters for puppet-cloudkitty # class cloudkitty::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $client_package_name = "python${pyvers}-cloudkittyclient" diff --git a/manifests/policy.pp b/manifests/policy.pp index 2f97440..454df05 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class cloudkitty::policy ( $policy_path = '/etc/cloudkitty/policy.json', ) { - include ::cloudkitty::deps - include ::cloudkitty::params + include cloudkitty::deps + include cloudkitty::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/processor.pp b/manifests/processor.pp index 49948b5..f7d6902 100644 --- a/manifests/processor.pp +++ b/manifests/processor.pp @@ -57,8 +57,8 @@ class cloudkitty::processor ( $auth_section = 'keystone_authtoken', ) { - include ::cloudkitty::deps - include ::cloudkitty::params + include cloudkitty::deps + include cloudkitty::params package { 'cloudkitty-processor': ensure => $package_ensure, diff --git a/manifests/storage.pp b/manifests/storage.pp index 33c5186..82c3077 100644 --- a/manifests/storage.pp +++ b/manifests/storage.pp @@ -12,7 +12,7 @@ class cloudkitty::storage( $extra_params = '--config-file /etc/cloudkitty/cloudkitty.conf', ){ - include ::cloudkitty::deps + include cloudkitty::deps exec { 'cloudkitty-storage-init': command => "cloudkitty-storage-init ${extra_params}", diff --git a/manifests/ui.pp b/manifests/ui.pp index d9c8226..c4e7eb1 100644 --- a/manifests/ui.pp +++ b/manifests/ui.pp @@ -12,8 +12,8 @@ class cloudkitty::ui ( $package_ensure = 'present', ) { - include ::cloudkitty::deps - include ::cloudkitty::params + include cloudkitty::deps + include cloudkitty::params package { 'cloudkitty-ui': ensure => $package_ensure, diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index ecc58e9..65eb164 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -119,12 +119,12 @@ class cloudkitty::wsgi::apache ( $custom_wsgi_process_options = {}, ) { - include ::cloudkitty::deps - include ::cloudkitty::params - include ::apache - include ::apache::mod::wsgi + include cloudkitty::deps + include cloudkitty::params + include apache + include apache::mod::wsgi if $ssl { - include ::apache::mod::ssl + include apache::mod::ssl } ::openstacklib::wsgi::apache { 'cloudkitty_wsgi': diff --git a/spec/acceptance/cloudkitty_wsgi_apache_spec.rb b/spec/acceptance/cloudkitty_wsgi_apache_spec.rb index 63e8cd5..6d466f7 100644 --- a/spec/acceptance/cloudkitty_wsgi_apache_spec.rb +++ b/spec/acceptance/cloudkitty_wsgi_apache_spec.rb @@ -6,11 +6,11 @@ describe 'basic cloudkitty' do it 'should work with no errors' do pp= <<-EOS - include ::openstack_integration - include ::openstack_integration::repos - include ::openstack_integration::rabbitmq - include ::openstack_integration::mysql - include ::openstack_integration::keystone + include openstack_integration + include openstack_integration::repos + include openstack_integration::rabbitmq + include openstack_integration::mysql + include openstack_integration::keystone rabbitmq_user { 'cloudkitty': admin => true, @@ -33,13 +33,13 @@ describe 'basic cloudkitty' do warning('Cloudkitty is not yet packaged on Debian systems.') } 'RedHat': { - class { '::cloudkitty::db': + class { 'cloudkitty::db': database_connection => 'mysql+pymysql://cloudkitty:a_big_secret@127.0.0.1/cloudkitty?charset=utf8', } - class { '::cloudkitty::logging': + class { 'cloudkitty::logging': debug => true, } - class { '::cloudkitty': + class { 'cloudkitty': default_transport_url => 'rabbit://cloudkitty:an_even_bigger_secret@127.0.0.1:5672', # NOTE(tobias-urdin): Cloudkitty in Stein has moved to storage v2 by default and the # only driver available is InfluxDB which we do not deploy. This sets it back to the @@ -47,24 +47,24 @@ describe 'basic cloudkitty' do storage_backend => 'sqlalchemy', storage_version => '1', } - class { '::cloudkitty::keystone::auth': + class { 'cloudkitty::keystone::auth': password => 'a_big_secret', } - class { '::cloudkitty::keystone::authtoken': + class { 'cloudkitty::keystone::authtoken': password => 'a_big_secret', } - class { '::cloudkitty::db::mysql': + class { 'cloudkitty::db::mysql': password => 'a_big_secret', } - class { '::cloudkitty::api': + class { 'cloudkitty::api': service_name => 'httpd', } - include ::apache - class { '::cloudkitty::wsgi::apache': + include apache + class { 'cloudkitty::wsgi::apache': ssl => false, } - class { '::cloudkitty::processor': } - class { '::cloudkitty::client': } + class { 'cloudkitty::processor': } + class { 'cloudkitty::client': } } default: { fail("Unsupported osfamily (${::osfamily})") diff --git a/spec/classes/cloudkitty_api_spec.rb b/spec/classes/cloudkitty_api_spec.rb index fbad957..4ff23ae 100644 --- a/spec/classes/cloudkitty_api_spec.rb +++ b/spec/classes/cloudkitty_api_spec.rb @@ -44,10 +44,10 @@ describe 'cloudkitty::api' do end let :pre_condition do - "include ::apache - include ::cloudkitty::db + "include apache + include cloudkitty::db class { 'cloudkitty': } - class { '::cloudkitty::keystone::authtoken': + class { 'cloudkitty::keystone::authtoken': password => 'a_big_secret', }" end @@ -68,10 +68,10 @@ describe 'cloudkitty::api' do end let :pre_condition do - "include ::apache - include ::cloudkitty::db + "include apache + include cloudkitty::db class { 'cloudkitty': } - class { '::cloudkitty::keystone::authtoken': + class { 'cloudkitty::keystone::authtoken': password => 'a_big_secret', }" end @@ -86,7 +86,7 @@ describe 'cloudkitty::api' do }) end let :pre_condition do - "class { '::cloudkitty::keystone::authtoken': + "class { 'cloudkitty::keystone::authtoken': password => 'a_big_secret', }" end