From b7f73b35c51243fd078d22f2e068e8786b467d16 Mon Sep 17 00:00:00 2001 From: Tobias Urdin Date: Sun, 8 Dec 2019 23:04:25 +0100 Subject: [PATCH] Convert all class usage to relative names Change-Id: Iae69aff79cc231336b14d65305fff9c64cbd27e0 --- example/all-in-one-keystone.pp | 8 ++++---- manifests/agent.pp | 2 +- manifests/api.pp | 4 ++-- manifests/backend/bind9.pp | 8 ++++---- manifests/backend/powerdns.pp | 10 +++++----- manifests/central.pp | 4 ++-- manifests/client.pp | 2 +- manifests/config.pp | 2 +- manifests/db.pp | 6 +++--- manifests/db/mysql.pp | 2 +- manifests/db/powerdns/mysql.pp | 2 +- manifests/db/powerdns/sync.pp | 4 ++-- manifests/db/sync.pp | 2 +- manifests/generic_service.pp | 4 ++-- manifests/init.pp | 2 +- manifests/keystone/auth.pp | 2 +- manifests/keystone/authtoken.pp | 2 +- manifests/logging.pp | 2 +- manifests/mdns.pp | 4 ++-- manifests/params.pp | 2 +- manifests/policy.pp | 4 ++-- manifests/pool.pp | 2 +- manifests/pool_nameserver.pp | 2 +- manifests/pool_target.pp | 6 +++--- manifests/quota.pp | 2 +- manifests/sink.pp | 2 +- manifests/worker.pp | 4 ++-- spec/acceptance/basic_designate_spec.rb | 12 ++++++------ spec/classes/designate_api_spec.rb | 2 +- 29 files changed, 55 insertions(+), 55 deletions(-) diff --git a/example/all-in-one-keystone.pp b/example/all-in-one-keystone.pp index 9d7ba414..23ea4370 100644 --- a/example/all-in-one-keystone.pp +++ b/example/all-in-one-keystone.pp @@ -23,12 +23,12 @@ node /designate/ { $db_host = '127.0.0.1' # == Keystone == # - class { '::keystone::db::mysql': + class { 'keystone::db::mysql': password => $keystone_db_password, allowed_hosts => '%', } - class { '::keystone': + class { 'keystone': validate_service => true, catalog_type => 'sql', enable_pki_setup => false, @@ -39,14 +39,14 @@ node /designate/ { } ## Adds the admin credential to keystone. - class { '::keystone::roles::admin': + class { 'keystone::roles::admin': email => 'admin@example.com', password => $keystone_password, admin_tenant => 'admin', } ## Installs the service user endpoint. - class { '::keystone::endpoint': } + class { 'keystone::endpoint': } # == Designate == # diff --git a/manifests/agent.pp b/manifests/agent.pp index 05e20cfd..4049b298 100644 --- a/manifests/agent.pp +++ b/manifests/agent.pp @@ -37,7 +37,7 @@ class designate::agent ( $listen = $::os_service_default, ) inherits designate { - include ::designate::deps + include designate::deps designate_config { 'service:agent/backend_driver' : value => $backend_driver; diff --git a/manifests/api.pp b/manifests/api.pp index 822e7a40..b32646b4 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -117,7 +117,7 @@ class designate::api ( $enabled_extensions_admin = $::os_service_default, ) inherits designate { - include ::designate::deps + include designate::deps if !is_service_default($enable_api_v1) { warning('Version 1 of API is deprecated.') @@ -146,7 +146,7 @@ class designate::api ( } if $auth_strategy == 'keystone' { - include ::designate::keystone::authtoken + include designate::keystone::authtoken } designate::generic_service { 'api': diff --git a/manifests/backend/bind9.pp b/manifests/backend/bind9.pp index 82bb5bdb..c49d27fb 100644 --- a/manifests/backend/bind9.pp +++ b/manifests/backend/bind9.pp @@ -32,14 +32,14 @@ class designate::backend::bind9 ( $rndc_controls = undef, ) { - include ::designate::deps - include ::designate + include designate::deps + include designate if $rndc_controls { - class { '::dns': + class { 'dns': controls => $rndc_controls, } } else { - include ::dns + include dns } designate_config { diff --git a/manifests/backend/powerdns.pp b/manifests/backend/powerdns.pp index 45df4114..dd76a65b 100644 --- a/manifests/backend/powerdns.pp +++ b/manifests/backend/powerdns.pp @@ -24,10 +24,10 @@ class designate::backend::powerdns ( $sync_db = true, ) { - include ::designate::deps - include ::designate - include ::powerdns - include ::powerdns::mysql + include designate::deps + include designate + include powerdns + include powerdns::mysql # The Ubuntu packages install several example config files in here, but only # one of them can exist, since they all load different powerdns backends. We @@ -43,6 +43,6 @@ class designate::backend::powerdns ( } if $sync_db { - include ::designate::db::powerdns::sync + include designate::db::powerdns::sync } } diff --git a/manifests/central.pp b/manifests/central.pp index 2a3d0439..16d816df 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -68,8 +68,8 @@ class designate::central ( $default_pool_id = $::os_service_default, ) inherits designate { - include ::designate::deps - include ::designate::db + include designate::deps + include designate::db designate_config { 'service:central/managed_resource_email' : value => $managed_resource_email; diff --git a/manifests/client.pp b/manifests/client.pp index cf20d948..0f2034f4 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -17,7 +17,7 @@ class designate::client ( $client_package_name = $::designate::params::client_package_name, ) inherits ::designate::params { - include ::designate::deps + include designate::deps package { 'python-designateclient': ensure => $package_ensure, diff --git a/manifests/config.pp b/manifests/config.pp index c50ca201..2356a8a8 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -36,7 +36,7 @@ class designate::config ( $rootwrap_config = {}, ) { - include ::designate::deps + include designate::deps validate_legacy(Hash, 'validate_hash', $designate_config) validate_legacy(Hash, 'validate_hash', $api_paste_ini_config) diff --git a/manifests/db.pp b/manifests/db.pp index 35a40e4f..67b9df85 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -51,8 +51,8 @@ class designate::db ( $sync_db = true, ) { - include ::designate::deps - include ::designate::params + include designate::deps + include designate::params validate_legacy(String, 'validate_re', $database_connection, ['(mysql(\+pymysql)?):\/\/(\S+:\S+@\S+\/\S+)?']) @@ -91,7 +91,7 @@ class designate::db ( } if $sync_db { - include ::designate::db::sync + include designate::db::sync } } diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index 02567a39..e2b5f06d 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -41,7 +41,7 @@ class designate::db::mysql( $allowed_hosts = undef, ) { - include ::designate::deps + include designate::deps ::openstacklib::db::mysql { 'designate': user => $user, diff --git a/manifests/db/powerdns/mysql.pp b/manifests/db/powerdns/mysql.pp index 2bb40b37..7950faa8 100644 --- a/manifests/db/powerdns/mysql.pp +++ b/manifests/db/powerdns/mysql.pp @@ -41,7 +41,7 @@ class designate::db::powerdns::mysql ( $allowed_hosts = undef, ) { - include ::designate::deps + include designate::deps ::openstacklib::db::mysql { 'powerdns': user => $user, diff --git a/manifests/db/powerdns/sync.pp b/manifests/db/powerdns/sync.pp index 4e824218..88ffe7a6 100644 --- a/manifests/db/powerdns/sync.pp +++ b/manifests/db/powerdns/sync.pp @@ -13,8 +13,8 @@ class designate::db::powerdns::sync( $extra_params = undef, ) { - include ::designate::deps - include ::designate::params + include designate::deps + include designate::params exec { 'designate-powerdns-dbsync': command => "designate-manage ${extra_params} powerdns sync", diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 8bbba6e3..817fbf48 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -14,7 +14,7 @@ class designate::db::sync( $extra_params = undef, ) { - include ::designate::deps + include designate::deps exec { 'designate-dbsync': command => "designate-manage ${extra_params} database sync", diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index dea85c8e..33599474 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -39,8 +39,8 @@ define designate::generic_service( $package_ensure = 'present', ) { - include ::designate::deps - include ::designate::params + include designate::deps + include designate::params $designate_title = "designate-${name}" Exec['post-designate_config'] ~> Anchor['designate::service::end'] diff --git a/manifests/init.pp b/manifests/init.pp index 591cedf9..4dc6eb7d 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -148,7 +148,7 @@ class designate( fail('The kombu_ssl_certfile and kombu_ssl_keyfile parameters must be used together') } - include ::designate::deps + include designate::deps exec { 'post-designate_config': command => '/bin/echo "designate config has changed"', diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index c60c8920..62f7e24f 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -87,7 +87,7 @@ class designate::keystone::auth ( $internal_url = 'http://127.0.0.1:9001/v1', ) { - include ::designate::deps + include designate::deps if $configure_user_role { Keystone_user_role["${auth_name}@${tenant}"] ~> Anchor['designate::service::end'] diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index def376d7..ca67b19d 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -208,7 +208,7 @@ class designate::keystone::authtoken( $service_token_roles_required = $::os_service_default, ) { - include ::designate::deps + include designate::deps if is_service_default($password) { fail('Please set password for designate service user') diff --git a/manifests/logging.pp b/manifests/logging.pp index e3fd5bf1..fb8afd0d 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -119,7 +119,7 @@ class designate::logging( $log_date_format = $::os_service_default, ) inherits ::designate::params { - include ::designate::deps + include designate::deps oslo::log { 'designate_config': debug => $debug, diff --git a/manifests/mdns.pp b/manifests/mdns.pp index c77d0597..ffea39d8 100644 --- a/manifests/mdns.pp +++ b/manifests/mdns.pp @@ -67,8 +67,8 @@ class designate::mdns ( $listen = $::os_service_default, ) inherits designate { - include ::designate::deps - include ::designate::db + include designate::deps + include designate::db designate_config { 'service:mdns/workers' : value => $workers; diff --git a/manifests/params.pp b/manifests/params.pp index 08132c43..2ecb275a 100644 --- a/manifests/params.pp +++ b/manifests/params.pp @@ -3,7 +3,7 @@ # Parameters for puppet-designate # class designate::params { - include ::openstacklib::defaults + include openstacklib::defaults $pyvers = $::openstacklib::defaults::pyvers $state_path = '/var/lib/designate' diff --git a/manifests/policy.pp b/manifests/policy.pp index 5996c412..fc9c4e9c 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -28,8 +28,8 @@ class designate::policy ( $policy_path = '/etc/designate/policy.json', ) { - include ::designate::deps - include ::designate::params + include designate::deps + include designate::params validate_legacy(Hash, 'validate_hash', $policies) diff --git a/manifests/pool.pp b/manifests/pool.pp index a4bf08c8..e35d9afd 100644 --- a/manifests/pool.pp +++ b/manifests/pool.pp @@ -19,7 +19,7 @@ define designate::pool( $also_notifies = [], ){ - include ::designate::deps + include designate::deps validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/], 'validate_re', $name, ['[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', diff --git a/manifests/pool_nameserver.pp b/manifests/pool_nameserver.pp index e993ee69..89804b61 100644 --- a/manifests/pool_nameserver.pp +++ b/manifests/pool_nameserver.pp @@ -13,7 +13,7 @@ define designate::pool_nameserver( $host = '127.0.0.1', ){ - include ::designate::deps + include designate::deps validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/], 'validate_re', $name, ['[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}', diff --git a/manifests/pool_target.pp b/manifests/pool_target.pp index 631d3fec..21d725d4 100644 --- a/manifests/pool_target.pp +++ b/manifests/pool_target.pp @@ -28,11 +28,11 @@ define designate::pool_target ( $masters = ['127.0.0.1:5354'], ) { - include ::designate::deps + include designate::deps if target == 'powerdns' { - include ::powerdns - include ::powerdns::mysql + include powerdns + include powerdns::mysql } validate_legacy(Pattern[/[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}/], diff --git a/manifests/quota.pp b/manifests/quota.pp index d390cb23..734b200e 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -37,7 +37,7 @@ class designate::quota ( $quota_recordset_records = $::os_service_default, ) { - include ::designate::deps + include designate::deps designate_config { 'DEFAULT/quota_api_export_size': value => $quota_api_export_size; diff --git a/manifests/sink.pp b/manifests/sink.pp index 1be8c64a..16efe2ef 100644 --- a/manifests/sink.pp +++ b/manifests/sink.pp @@ -34,7 +34,7 @@ class designate::sink ( $enabled_notification_handlers = undef, ) inherits designate { - include ::designate::deps + include designate::deps designate::generic_service { 'sink': enabled => $enabled, diff --git a/manifests/worker.pp b/manifests/worker.pp index 6735e48c..740fd3aa 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -83,8 +83,8 @@ class designate::worker( $worker_topic = $::os_service_default, ) { - include ::designate::deps - include ::designate::params + include designate::deps + include designate::params if $manage_package { package { 'designate-worker': diff --git a/spec/acceptance/basic_designate_spec.rb b/spec/acceptance/basic_designate_spec.rb index dff58cd8..02b650a9 100644 --- a/spec/acceptance/basic_designate_spec.rb +++ b/spec/acceptance/basic_designate_spec.rb @@ -6,12 +6,12 @@ describe 'basic designate' 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::designate + include openstack_integration + include openstack_integration::repos + include openstack_integration::rabbitmq + include openstack_integration::mysql + include openstack_integration::keystone + include openstack_integration::designate EOS # Run it twice and test for idempotency diff --git a/spec/classes/designate_api_spec.rb b/spec/classes/designate_api_spec.rb index ac70dc55..0ed277cb 100644 --- a/spec/classes/designate_api_spec.rb +++ b/spec/classes/designate_api_spec.rb @@ -6,7 +6,7 @@ require 'spec_helper' describe 'designate::api' do let :pre_condition do - "class { '::designate::keystone::authtoken': + "class { 'designate::keystone::authtoken': password => 'a_big_secret', }" end