From 8f560f1de1c117a6ffcf12be9f4051c9743836b4 Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 19 Aug 2025 23:11:38 +0900 Subject: [PATCH] Prepare for voxpupuli-puppet-lint-plugins Fix new lint errors detected when full of the voxpupili lint plugins are enabled. Change-Id: I9705ad334d05a2041f0f9c4b885fc3fd44342720 Signed-off-by: Takashi Kajinami --- example/all-in-one-keystone.pp | 20 +++++++++---------- example/all-in-one-noauth.pp | 11 ++++------ manifests/api.pp | 2 -- manifests/backend/bind9.pp | 3 +-- manifests/backend/pdns4.pp | 1 - manifests/central.pp | 1 - manifests/client.pp | 2 -- manifests/config.pp | 1 - manifests/coordination.pp | 3 +-- manifests/cors.pp | 1 - manifests/db.pp | 1 - manifests/db/mysql.pp | 4 +--- manifests/db/postgresql.pp | 4 +--- manifests/db/sync.pp | 4 +--- manifests/generic_service.pp | 3 +-- manifests/healthcheck.pp | 1 - manifests/init.pp | 4 +--- manifests/keystone.pp | 1 - manifests/keystone/auth.pp | 2 -- manifests/keystone/authtoken.pp | 3 +-- manifests/logging.pp | 4 +--- manifests/mdns.pp | 1 - manifests/network_api/neutron.pp | 1 - manifests/policy.pp | 2 -- manifests/producer.pp | 1 - manifests/producer_task/delayed_notify.pp | 1 - manifests/producer_task/increment_serial.pp | 1 - manifests/producer_task/periodic_exists.pp | 1 - .../periodic_secondary_refresh.pp | 1 - .../producer_task/worker_periodic_recovery.pp | 1 - manifests/producer_task/zone_purge.pp | 1 - manifests/quota.pp | 1 - manifests/reports.pp | 3 +-- manifests/sink.pp | 1 - manifests/sink/neutron_floatingip.pp | 1 - manifests/sink/nova_fixed.pp | 1 - manifests/worker.pp | 3 +-- manifests/wsgi/apache.pp | 1 - manifests/wsgi/uwsgi.pp | 3 +-- 39 files changed, 25 insertions(+), 76 deletions(-) diff --git a/example/all-in-one-keystone.pp b/example/all-in-one-keystone.pp index e293dce6..dd463c72 100644 --- a/example/all-in-one-keystone.pp +++ b/example/all-in-one-keystone.pp @@ -5,7 +5,6 @@ # dig www.example.net @127.0.0.1 +short # node /designate/ { - include apt include rabbitmq include mysql::server @@ -25,7 +24,7 @@ node /designate/ { # == Keystone == # class { 'keystone::db::mysql': password => $keystone_db_password, - allowed_hosts => '%', + allowed_hosts => '%', } class { 'keystone': @@ -35,26 +34,25 @@ node /designate/ { admin_token => $keystone_admin_token, token_provider => 'keystone.token.providers.uuid.Provider', token_driver => 'keystone.token.backends.sql.Token', - database_connection => "mysql://keystone:${keystone_db_password}@${keystone_db_host}/keystone", + database_connection => "mysql://keystone:${keystone_db_password}@${keystone_db_host}/keystone", } ## Adds the admin credential to keystone. class { 'keystone::roles::admin': email => 'admin@example.com', - password => $keystone_password, + password => $keystone_password, admin_tenant => 'admin', } ## Installs the service user endpoint. class { 'keystone::endpoint': } - # == Designate == # - class {'designate::db::mysql': + class { 'designate::db::mysql': password => $designate_db_password, } - class {'designate': + class { 'designate': default_transport_url => os_transport_url({ 'transport' => 'rabbit', 'host' => '127.0.0.1', @@ -64,12 +62,12 @@ node /designate/ { }), } - class {'designate::db': + class { 'designate::db': database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate", } include designate::client - class {'designate::api': + class { 'designate::api': auth_strategy => $auth_strategy, keystone_password => $keystone_password, } @@ -77,12 +75,12 @@ node /designate/ { include designate::central include designate::dns - class {'designate::backend::bind9': + class { 'designate::backend::bind9': rndc_config_file => '', rndc_key_file => '', } - class {'designate::keystone::auth': + class { 'designate::keystone::auth': password => $keystone_password, } } diff --git a/example/all-in-one-noauth.pp b/example/all-in-one-noauth.pp index 414b5197..6c8e6364 100644 --- a/example/all-in-one-noauth.pp +++ b/example/all-in-one-noauth.pp @@ -1,5 +1,4 @@ node /designate/ { - include apt include rabbitmq include mysql::server @@ -9,16 +8,14 @@ node /designate/ { $designate_db_password = 'admin' $db_host = '127.0.0.1' - include designate::dns include designate::backend::bind9 - class {'designate::db::mysql': + class { 'designate::db::mysql': password => $designate_db_password, } - - class {'designate': + class { 'designate': default_transport_url => os_transport_url({ 'transport' => 'rabbit', 'host' => '127.0.0.1', @@ -28,11 +25,11 @@ node /designate/ { }), } - class {'designate::db': + class { 'designate::db': database_connection => "mysql://designate:${designate_db_password}@${db_host}/designate", } - class {'designate::api': + class { 'designate::api': auth_strategy => $auth_strategy, } diff --git a/manifests/api.pp b/manifests/api.pp index 43869981..bed0dd80 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -131,7 +131,6 @@ class designate::api ( $max_request_body_size = $facts['os_service_default'], $service_name = $designate::params::api_service_name, ) inherits designate { - include designate::deps include designate::policy @@ -179,7 +178,6 @@ class designate::api ( # On any paste-api.ini config change, we must restart Designate API. Designate_api_paste_ini<||> ~> Service[$service_name] - } else { $service_name_real = $service_name diff --git a/manifests/backend/bind9.pp b/manifests/backend/bind9.pp index 63d5c359..9720a37a 100644 --- a/manifests/backend/bind9.pp +++ b/manifests/backend/bind9.pp @@ -63,7 +63,7 @@ class designate::backend::bind9 ( $rndc_key_file = undef, $rndc_controls = undef, $rndc_port = undef, - Hash[Integer, String] $ns_records = {1 => 'ns1.example.org.'}, + Hash[Integer, String] $ns_records = { 1 => 'ns1.example.org.' }, Array[String[1], 1] $nameservers = ['127.0.0.1'], Array[String[1], 1] $bind9_hosts = ['127.0.0.1'], $dns_port = 53, @@ -73,7 +73,6 @@ class designate::backend::bind9 ( Array[String[1]] $also_notifies = [], Hash[String[1], String[1]] $attributes = {}, ) { - include designate::deps include designate::params diff --git a/manifests/backend/pdns4.pp b/manifests/backend/pdns4.pp index 9b71f752..be4a0e57 100644 --- a/manifests/backend/pdns4.pp +++ b/manifests/backend/pdns4.pp @@ -52,7 +52,6 @@ class designate::backend::pdns4 ( Array[String[1]] $also_notifies = [], Hash[String[1], String[1]] $attributes = {}, ) { - include designate::deps include designate::params diff --git a/manifests/central.pp b/manifests/central.pp index 2a5e7bc3..e4b6fd47 100644 --- a/manifests/central.pp +++ b/manifests/central.pp @@ -71,7 +71,6 @@ class designate::central ( $default_pool_id = $facts['os_service_default'], $scheduler_filters = $facts['os_service_default'], ) inherits designate::params { - include designate::deps include designate::db diff --git a/manifests/client.pp b/manifests/client.pp index 93bbff65..fe436ec4 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -16,7 +16,6 @@ class designate::client ( $package_ensure = 'present', $client_package_name = $designate::params::client_package_name, ) inherits designate::params { - include designate::deps package { 'python-designateclient': @@ -26,5 +25,4 @@ class designate::client ( } include openstacklib::openstackclient - } diff --git a/manifests/config.pp b/manifests/config.pp index 9d210d07..0f7c958f 100644 --- a/manifests/config.pp +++ b/manifests/config.pp @@ -35,7 +35,6 @@ class designate::config ( Hash $api_paste_ini_config = {}, Hash $rootwrap_config = {}, ) { - include designate::deps create_resources('designate_config', $designate_config) diff --git a/manifests/coordination.pp b/manifests/coordination.pp index 71e53ec7..d4528a9f 100644 --- a/manifests/coordination.pp +++ b/manifests/coordination.pp @@ -23,10 +23,9 @@ class designate::coordination ( $heartbeat_interval = $facts['os_service_default'], $run_watchers_interval = $facts['os_service_default'], ) { - include designate::deps - oslo::coordination{ 'designate_config': + oslo::coordination { 'designate_config': backend_url => $backend_url, } diff --git a/manifests/cors.pp b/manifests/cors.pp index b78a6a6e..be4a4673 100644 --- a/manifests/cors.pp +++ b/manifests/cors.pp @@ -44,7 +44,6 @@ class designate::cors ( $allow_methods = $facts['os_service_default'], $allow_headers = $facts['os_service_default'], ) { - include designate::deps oslo::cors { 'designate_config': diff --git a/manifests/db.pp b/manifests/db.pp index 9e7e0726..121aaa44 100644 --- a/manifests/db.pp +++ b/manifests/db.pp @@ -62,7 +62,6 @@ class designate::db ( $mysql_enable_ndb = $facts['os_service_default'], Boolean $sync_db = true, ) { - include designate::deps oslo::db { 'designate_config': diff --git a/manifests/db/mysql.pp b/manifests/db/mysql.pp index b68dcacf..b329569b 100644 --- a/manifests/db/mysql.pp +++ b/manifests/db/mysql.pp @@ -31,7 +31,7 @@ # (Optional) Additional hosts that are allowed to access this DB # Defaults to undef # -class designate::db::mysql( +class designate::db::mysql ( $password, $dbname = 'designate', $user = 'designate', @@ -40,7 +40,6 @@ class designate::db::mysql( $collate = 'utf8_general_ci', $allowed_hosts = undef, ) { - include designate::deps openstacklib::db::mysql { 'designate': @@ -56,5 +55,4 @@ class designate::db::mysql( Anchor['designate::db::begin'] ~> Class['designate::db::mysql'] ~> Anchor['designate::db::end'] - } diff --git a/manifests/db/postgresql.pp b/manifests/db/postgresql.pp index 9b659d53..9c5f89b2 100644 --- a/manifests/db/postgresql.pp +++ b/manifests/db/postgresql.pp @@ -24,14 +24,13 @@ # (Optional) Privileges given to the database user. # Default to 'ALL' # -class designate::db::postgresql( +class designate::db::postgresql ( $password, $dbname = 'designate', $user = 'designate', $encoding = undef, $privileges = 'ALL', ) { - include designate::deps openstacklib::db::postgresql { 'designate': @@ -42,7 +41,6 @@ class designate::db::postgresql( privileges => $privileges, } - Anchor['designate::db::begin'] ~> Class['designate::db::postgresql'] ~> Anchor['designate::db::end'] diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 064c7e95..ddf5aa73 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -14,11 +14,10 @@ # (Optional) Timeout for the execution of the db_sync # Defaults to 300 # -class designate::db::sync( +class designate::db::sync ( $extra_params = undef, $db_sync_timeout = 300, ) { - include designate::deps include designate::params @@ -39,5 +38,4 @@ class designate::db::sync( notify => Anchor['designate::dbsync::end'], tag => 'openstack-db', } - } diff --git a/manifests/generic_service.pp b/manifests/generic_service.pp index 904bebfb..ec1c2c5e 100644 --- a/manifests/generic_service.pp +++ b/manifests/generic_service.pp @@ -31,14 +31,13 @@ # (optional) Control the ensure parameter for the package resource. # Defaults to 'present'. # -define designate::generic_service( +define designate::generic_service ( $package_name, $service_name, Boolean $enabled = false, Boolean $manage_service = true, $package_ensure = 'present', ) { - include designate::deps include designate::params diff --git a/manifests/healthcheck.pp b/manifests/healthcheck.pp index 3c56b4eb..5e19aec3 100644 --- a/manifests/healthcheck.pp +++ b/manifests/healthcheck.pp @@ -46,7 +46,6 @@ class designate::healthcheck ( $disable_by_file_paths = $facts['os_service_default'], $enable_by_file_paths = $facts['os_service_default'], ) { - include designate::deps oslo::healthcheck { 'designate_config': diff --git a/manifests/init.pp b/manifests/init.pp index 1b98a0b8..e2dd48ef 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -195,7 +195,7 @@ # will be run through a green thread. # Defaults to undef # -class designate( +class designate ( $package_ensure = present, $common_package_name = $designate::params::common_package_name, $host = $facts['os_service_default'], @@ -237,7 +237,6 @@ class designate( # DEPRECATED PARAMETERS $rabbit_heartbeat_in_pthread = undef, ) inherits designate::params { - include designate::deps package { 'designate-common': @@ -298,5 +297,4 @@ class designate( 'DEFAULT/default_ttl': value => $default_ttl; 'DEFAULT/supported_record_type': value => join(any2array($supported_record_type), ','); } - } diff --git a/manifests/keystone.pp b/manifests/keystone.pp index fb228c7e..be7be0a9 100644 --- a/manifests/keystone.pp +++ b/manifests/keystone.pp @@ -56,7 +56,6 @@ class designate::keystone ( $status_code_retries = $facts['os_service_default'], $status_code_retry_delay = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/keystone/auth.pp b/manifests/keystone/auth.pp index 76ab8086..65306432 100644 --- a/manifests/keystone/auth.pp +++ b/manifests/keystone/auth.pp @@ -106,7 +106,6 @@ class designate::keystone::auth ( Keystone::EndpointUrl $admin_url = 'http://127.0.0.1:9001', Keystone::EndpointUrl $internal_url = 'http://127.0.0.1:9001', ) { - include designate::deps Keystone::Resource::Service_identity['designate'] -> Anchor['designate::service::end'] @@ -131,5 +130,4 @@ class designate::keystone::auth ( internal_url => $internal_url, admin_url => $admin_url, } - } diff --git a/manifests/keystone/authtoken.pp b/manifests/keystone/authtoken.pp index 1e7f73fb..2fd121b0 100644 --- a/manifests/keystone/authtoken.pp +++ b/manifests/keystone/authtoken.pp @@ -199,7 +199,7 @@ # (Optional) Hash of additional parameters to pass through to the keystone # authtoken class. Values set here override the individual parameters above. # -class designate::keystone::authtoken( +class designate::keystone::authtoken ( String[1] $password, $username = 'designate', $auth_url = 'http://localhost:5000', @@ -239,7 +239,6 @@ class designate::keystone::authtoken( $interface = $facts['os_service_default'], $params = {} ) { - include designate::deps keystone::resource::authtoken { diff --git a/manifests/logging.pp b/manifests/logging.pp index 62c0758f..bed7aa34 100644 --- a/manifests/logging.pp +++ b/manifests/logging.pp @@ -97,7 +97,7 @@ # Defaults to $facts['os_service_default'] # Example: 'Y-%m-%d %H:%M:%S' # -class designate::logging( +class designate::logging ( $use_syslog = $facts['os_service_default'], $use_json = $facts['os_service_default'], $use_journal = $facts['os_service_default'], @@ -118,7 +118,6 @@ class designate::logging( $instance_uuid_format = $facts['os_service_default'], $log_date_format = $facts['os_service_default'], ) inherits designate::params { - include designate::deps oslo::log { 'designate_config': @@ -142,5 +141,4 @@ class designate::logging( instance_format => $instance_format, instance_uuid_format => $instance_uuid_format, } - } diff --git a/manifests/mdns.pp b/manifests/mdns.pp index 39dde8a6..e303c187 100644 --- a/manifests/mdns.pp +++ b/manifests/mdns.pp @@ -66,7 +66,6 @@ class designate::mdns ( $max_message_size = $facts['os_service_default'], $listen = $facts['os_service_default'], ) inherits designate::params { - include designate::deps include designate::db diff --git a/manifests/network_api/neutron.pp b/manifests/network_api/neutron.pp index d7b8cec5..d890ad38 100644 --- a/manifests/network_api/neutron.pp +++ b/manifests/network_api/neutron.pp @@ -29,5 +29,4 @@ class designate::network_api::neutron ( 'network_api:neutron/endpoint_type': value => $endpoint_type; 'network_api:neutron/timeout': value => $timeout; } - } diff --git a/manifests/policy.pp b/manifests/policy.pp index dbbbeea6..47438456 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -54,7 +54,6 @@ class designate::policy ( $policy_dirs = $facts['os_service_default'], Boolean $purge_config = false, ) { - include designate::deps include designate::params @@ -82,5 +81,4 @@ class designate::policy ( policy_default_rule => $policy_default_rule, policy_dirs => $policy_dirs, } - } diff --git a/manifests/producer.pp b/manifests/producer.pp index 8f5add6f..d7b1cb11 100644 --- a/manifests/producer.pp +++ b/manifests/producer.pp @@ -41,7 +41,6 @@ class designate::producer ( $threads = $facts['os_service_default'], $enabled_tasks = $facts['os_service_default'], ) inherits designate::params { - include designate::deps designate_config { diff --git a/manifests/producer_task/delayed_notify.pp b/manifests/producer_task/delayed_notify.pp index 3cbdfd57..81388585 100644 --- a/manifests/producer_task/delayed_notify.pp +++ b/manifests/producer_task/delayed_notify.pp @@ -21,7 +21,6 @@ class designate::producer_task::delayed_notify ( $per_page = $facts['os_service_default'], $batch_size = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/producer_task/increment_serial.pp b/manifests/producer_task/increment_serial.pp index 92b2fa78..5137be62 100644 --- a/manifests/producer_task/increment_serial.pp +++ b/manifests/producer_task/increment_serial.pp @@ -21,7 +21,6 @@ class designate::producer_task::increment_serial ( $per_page = $facts['os_service_default'], $batch_size = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/producer_task/periodic_exists.pp b/manifests/producer_task/periodic_exists.pp index b6e116ac..cc895e64 100644 --- a/manifests/producer_task/periodic_exists.pp +++ b/manifests/producer_task/periodic_exists.pp @@ -16,7 +16,6 @@ class designate::producer_task::periodic_exists ( $interval = $facts['os_service_default'], $per_page = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/producer_task/periodic_secondary_refresh.pp b/manifests/producer_task/periodic_secondary_refresh.pp index a8e336e6..d1cbf90a 100644 --- a/manifests/producer_task/periodic_secondary_refresh.pp +++ b/manifests/producer_task/periodic_secondary_refresh.pp @@ -16,7 +16,6 @@ class designate::producer_task::periodic_secondary_refresh ( $interval = $facts['os_service_default'], $per_page = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/producer_task/worker_periodic_recovery.pp b/manifests/producer_task/worker_periodic_recovery.pp index c7b230e4..56998663 100644 --- a/manifests/producer_task/worker_periodic_recovery.pp +++ b/manifests/producer_task/worker_periodic_recovery.pp @@ -16,7 +16,6 @@ class designate::producer_task::worker_periodic_recovery ( $interval = $facts['os_service_default'], $per_page = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/producer_task/zone_purge.pp b/manifests/producer_task/zone_purge.pp index 5436f592..85881e99 100644 --- a/manifests/producer_task/zone_purge.pp +++ b/manifests/producer_task/zone_purge.pp @@ -27,7 +27,6 @@ class designate::producer_task::zone_purge ( $time_threshold = $facts['os_service_default'], $batch_size = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/quota.pp b/manifests/quota.pp index 4255cee2..8e112a05 100644 --- a/manifests/quota.pp +++ b/manifests/quota.pp @@ -36,7 +36,6 @@ class designate::quota ( $quota_driver = $facts['os_service_default'], $quota_recordset_records = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/reports.pp b/manifests/reports.pp index dabb3321..ac8dcf14 100644 --- a/manifests/reports.pp +++ b/manifests/reports.pp @@ -17,12 +17,11 @@ # is set. # Defaults to $facts['os_service_default'] # -class designate::reports( +class designate::reports ( $log_dir = $facts['os_service_default'], $file_event_handler = $facts['os_service_default'], $file_event_handler_interval = $facts['os_service_default'], ) { - include designate::deps oslo::reports { 'designate_config': diff --git a/manifests/sink.pp b/manifests/sink.pp index 45ad5c65..3549d94a 100644 --- a/manifests/sink.pp +++ b/manifests/sink.pp @@ -43,7 +43,6 @@ class designate::sink ( $threads = $facts['os_service_default'], $enabled_notification_handlers = $facts['os_service_default'], ) inherits designate::params { - include designate::deps designate::generic_service { 'sink': diff --git a/manifests/sink/neutron_floatingip.pp b/manifests/sink/neutron_floatingip.pp index d4dd9b3f..78f3d79c 100644 --- a/manifests/sink/neutron_floatingip.pp +++ b/manifests/sink/neutron_floatingip.pp @@ -31,7 +31,6 @@ class designate::sink::neutron_floatingip ( $formatv4 = $facts['os_service_default'], $formatv6 = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/sink/nova_fixed.pp b/manifests/sink/nova_fixed.pp index 846cd29f..c2763610 100644 --- a/manifests/sink/nova_fixed.pp +++ b/manifests/sink/nova_fixed.pp @@ -31,7 +31,6 @@ class designate::sink::nova_fixed ( $formatv4 = $facts['os_service_default'], $formatv6 = $facts['os_service_default'], ) { - include designate::deps designate_config { diff --git a/manifests/worker.pp b/manifests/worker.pp index 0392c30f..ada1e76d 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -76,7 +76,7 @@ # (Optional) Send all traffic over TCP. # Defaults to $facts['os_service_default'] # -class designate::worker( +class designate::worker ( $package_ensure = present, $worker_package_name = $designate::params::worker_package_name, Boolean $enabled = true, @@ -96,7 +96,6 @@ class designate::worker( $serial_timeout = $facts['os_service_default'], $all_tcp = $facts['os_service_default'], ) inherits designate::params { - include designate::deps designate::generic_service { 'worker': diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index 18eb8007..834bc84c 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -150,7 +150,6 @@ class designate::wsgi::apache ( $request_headers = undef, $vhost_custom_fragment = undef, ) { - include designate::deps include designate::params diff --git a/manifests/wsgi/uwsgi.pp b/manifests/wsgi/uwsgi.pp index 9e57cb39..a5b2b925 100644 --- a/manifests/wsgi/uwsgi.pp +++ b/manifests/wsgi/uwsgi.pp @@ -25,8 +25,7 @@ class designate::wsgi::uwsgi ( $processes = $facts['os_workers'], $threads = 32, $listen_queue_size = 100, -){ - +) { include designate::deps if $facts['os']['name'] != 'Debian' {