From fda28025abddb10df8e573b6671da28e07782a0a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Fri, 15 Aug 2025 20:09:02 +0900 Subject: [PATCH] Prepare for new lint plugins This fixes a few lint warnings/errors detected by the following plugins we aim to enable soon. - puppet-lint-file_ensure-check - puppet-lint-trailing_comma-check - puppet-lint-topscope-variable-check Change-Id: Idb41ff61080e268ff00897c21131c5ea51305d8b Signed-off-by: Takashi Kajinami --- manifests/api.pp | 12 ++++++------ manifests/certificates.pp | 4 ++-- manifests/client.pp | 2 +- manifests/db/sync.pp | 2 +- manifests/db/sync_persistence.pp | 2 +- manifests/driver_agent.pp | 6 +++--- manifests/health_manager.pp | 4 ++-- manifests/housekeeping.pp | 4 ++-- manifests/init.pp | 2 +- manifests/policy.pp | 2 +- manifests/provider/ovn.pp | 2 +- manifests/roles.pp | 4 ++-- manifests/task_flow.pp | 6 +++--- manifests/worker.pp | 33 ++++++++++++++++---------------- manifests/wsgi/apache.pp | 12 ++++++------ 15 files changed, 49 insertions(+), 48 deletions(-) diff --git a/manifests/api.pp b/manifests/api.pp index d3b97b8d..1850972f 100644 --- a/manifests/api.pp +++ b/manifests/api.pp @@ -17,7 +17,7 @@ # service, and you must use another class to configure that # web service. For example, use class { 'octavia::wsgi::apache'...} # to make octavia-api be a web app using apache mod_wsgi. -# Defaults to $::octavia::params::api_service_name +# Defaults to $octavia::params::api_service_name # # [*host*] # (optional) The octavia api bind address. @@ -122,7 +122,7 @@ class octavia::api ( Boolean $enabled = true, Boolean $manage_service = true, - $service_name = $::octavia::params::api_service_name, + $service_name = $octavia::params::api_service_name, $host = '0.0.0.0', $port = '9876', $package_ensure = 'present', @@ -159,7 +159,7 @@ class octavia::api ( package { 'octavia-api': ensure => $package_ensure, - name => $::octavia::params::api_package_name, + name => $octavia::params::api_package_name, tag => ['openstack', 'octavia-package'], } @@ -170,10 +170,10 @@ class octavia::api ( $service_ensure = 'stopped' } - if $service_name == $::octavia::params::api_service_name { + if $service_name == $octavia::params::api_service_name { service { 'octavia-api': ensure => $service_ensure, - name => $::octavia::params::api_service_name, + name => $octavia::params::api_service_name, enable => $enabled, hasstatus => true, hasrestart => true, @@ -186,7 +186,7 @@ class octavia::api ( } elsif $service_name == 'httpd' { service { 'octavia-api': ensure => 'stopped', - name => $::octavia::params::api_service_name, + name => $octavia::params::api_service_name, enable => false, tag => 'octavia-service', } diff --git a/manifests/certificates.pp b/manifests/certificates.pp index 19913d09..0141d3f3 100644 --- a/manifests/certificates.pp +++ b/manifests/certificates.pp @@ -135,8 +135,8 @@ class octavia::certificates ( Optional[String[1]] $client_ca_source = undef, Optional[String[1]] $client_cert_data = undef, Optional[String[1]] $client_cert_source = undef, - $file_permission_owner = $::octavia::params::user, - $file_permission_group = $::octavia::params::group, + $file_permission_owner = $octavia::params::user, + $file_permission_group = $octavia::params::group, ) inherits octavia::params { include octavia::deps diff --git a/manifests/client.pp b/manifests/client.pp index 4b15a43a..5685588a 100644 --- a/manifests/client.pp +++ b/manifests/client.pp @@ -16,7 +16,7 @@ class octavia::client ( package { 'python-octaviaclient': ensure => $ensure, - name => $::octavia::params::client_package_name, + name => $octavia::params::client_package_name, tag => ['openstack', 'openstackclient'], } include openstacklib::openstackclient diff --git a/manifests/db/sync.pp b/manifests/db/sync.pp index 7128a3f1..d3ce5e54 100644 --- a/manifests/db/sync.pp +++ b/manifests/db/sync.pp @@ -23,7 +23,7 @@ class octavia::db::sync( exec { 'octavia-db-sync': command => "octavia-db-manage upgrade head ${extra_params}", path => '/usr/bin', - user => $::octavia::params::user, + user => $octavia::params::user, refreshonly => true, try_sleep => 5, tries => 10, diff --git a/manifests/db/sync_persistence.pp b/manifests/db/sync_persistence.pp index 52d1e33f..8353f2ef 100644 --- a/manifests/db/sync_persistence.pp +++ b/manifests/db/sync_persistence.pp @@ -23,7 +23,7 @@ class octavia::db::sync_persistence( exec { 'octavia-db-sync-persistence': command => "octavia-db-manage upgrade_persistence ${extra_params}", path => '/usr/bin', - user => $::octavia::params::user, + user => $octavia::params::user, refreshonly => true, try_sleep => 5, tries => 10, diff --git a/manifests/driver_agent.pp b/manifests/driver_agent.pp index bed9e7dd..33e144ea 100644 --- a/manifests/driver_agent.pp +++ b/manifests/driver_agent.pp @@ -91,7 +91,7 @@ class octavia::driver_agent ( package { 'octavia-driver-agent': ensure => $package_ensure, - name => $::octavia::params::driver_agent_package_name, + name => $octavia::params::driver_agent_package_name, tag => ['openstack', 'octavia-package'], } @@ -104,11 +104,11 @@ class octavia::driver_agent ( service { 'octavia-driver-agent': ensure => $service_ensure, - name => $::octavia::params::driver_agent_service_name, + name => $octavia::params::driver_agent_service_name, enable => $enabled, hasstatus => true, hasrestart => true, - tag => ['octavia-service'] + tag => ['octavia-service'], } } diff --git a/manifests/health_manager.pp b/manifests/health_manager.pp index 860fb10e..cf27f7c4 100644 --- a/manifests/health_manager.pp +++ b/manifests/health_manager.pp @@ -72,7 +72,7 @@ class octavia::health_manager ( package { 'octavia-health-manager': ensure => $package_ensure, - name => $::octavia::params::health_manager_package_name, + name => $octavia::params::health_manager_package_name, tag => ['openstack', 'octavia-package'], } @@ -85,7 +85,7 @@ class octavia::health_manager ( service { 'octavia-health-manager': ensure => $service_ensure, - name => $::octavia::params::health_manager_service_name, + name => $octavia::params::health_manager_service_name, enable => $enabled, hasstatus => true, hasrestart => true, diff --git a/manifests/housekeeping.pp b/manifests/housekeeping.pp index 900b2e4d..894a9040 100644 --- a/manifests/housekeeping.pp +++ b/manifests/housekeeping.pp @@ -55,7 +55,7 @@ class octavia::housekeeping ( package { 'octavia-housekeeping': ensure => $package_ensure, - name => $::octavia::params::housekeeping_package_name, + name => $octavia::params::housekeeping_package_name, tag => ['openstack', 'octavia-package'], } @@ -68,7 +68,7 @@ class octavia::housekeeping ( service { 'octavia-housekeeping': ensure => $service_ensure, - name => $::octavia::params::housekeeping_service_name, + name => $octavia::params::housekeeping_service_name, enable => $enabled, hasstatus => true, hasrestart => true, diff --git a/manifests/init.pp b/manifests/init.pp index b3357159..98aed5f6 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -226,7 +226,7 @@ class octavia ( package { 'octavia': ensure => $package_ensure, - name => $::octavia::params::common_package_name, + name => $octavia::params::common_package_name, tag => ['openstack', 'octavia-package'], } diff --git a/manifests/policy.pp b/manifests/policy.pp index 20ed026a..218788a4 100644 --- a/manifests/policy.pp +++ b/manifests/policy.pp @@ -62,7 +62,7 @@ class octavia::policy ( policies => $policies, policy_path => $policy_path, file_user => 'root', - file_group => $::octavia::params::group, + file_group => $octavia::params::group, file_format => 'yaml', purge_config => $purge_config, tag => 'octavia', diff --git a/manifests/provider/ovn.pp b/manifests/provider/ovn.pp index 7861019c..2ebe70b5 100644 --- a/manifests/provider/ovn.pp +++ b/manifests/provider/ovn.pp @@ -75,7 +75,7 @@ class octavia::provider::ovn ( package { 'ovn-octavia-provider': ensure => $package_ensure, - name => $::octavia::params::ovn_provider_package_name, + name => $octavia::params::ovn_provider_package_name, tag => ['openstack', 'octavia-package'], } diff --git a/manifests/roles.pp b/manifests/roles.pp index 22837cce..17a919e7 100644 --- a/manifests/roles.pp +++ b/manifests/roles.pp @@ -17,12 +17,12 @@ class octavia::roles ( 'load-balancer_member', 'load-balancer_quota_admin', 'load-balancer_admin', - 'admin' + 'admin', ] ) { if $role_names { keystone_role { $role_names: - ensure => present + ensure => present, } } } diff --git a/manifests/task_flow.pp b/manifests/task_flow.pp index d1c16fef..81c7dc81 100644 --- a/manifests/task_flow.pp +++ b/manifests/task_flow.pp @@ -157,7 +157,7 @@ class octavia::task_flow ( case $jobboard_backend_driver { 'zookeeper_taskflow_driver': { stdlib::ensure_packages('python-kazoo', { - name => $::octavia::params::python_kazoo_package_name, + name => $octavia::params::python_kazoo_package_name, ensure => $package_ensure, tag => ['openstack'], }) @@ -167,7 +167,7 @@ class octavia::task_flow ( } 'etcd_taskflow_driver': { stdlib::ensure_packages('python-etcd3gw', { - name => $::octavia::params::python_etcd3gw_package_name, + name => $octavia::params::python_etcd3gw_package_name, ensure => $package_ensure, tag => ['openstack'], }) @@ -177,7 +177,7 @@ class octavia::task_flow ( } default: { stdlib::ensure_packages('python-redis', { - name => $::octavia::params::python_redis_package_name, + name => $octavia::params::python_redis_package_name, ensure => $package_ensure, tag => ['openstack'], }) diff --git a/manifests/worker.pp b/manifests/worker.pp index 9e55d472..72130a9c 100644 --- a/manifests/worker.pp +++ b/manifests/worker.pp @@ -70,10 +70,11 @@ class octavia::worker ( include octavia::controller if $manage_nova_flavor { - $octavia_flavor = { "octavia_${::octavia::controller::amp_flavor_id}" => - { 'id' => $::octavia::controller::amp_flavor_id, - 'project_name' => $amp_project_name - } + $octavia_flavor = { + "octavia_${octavia::controller::amp_flavor_id}" => { + 'id' => $octavia::controller::amp_flavor_id, + 'project_name' => $amp_project_name, + }, } $octavia_flavor_defaults = { @@ -82,7 +83,7 @@ class octavia::worker ( 'disk' => '2', 'vcpus' => '1', 'is_public' => false, - 'tag' => ['octavia'] + 'tag' => ['octavia'], } $nova_flavor_defaults = stdlib::merge($octavia_flavor_defaults, $nova_flavor_config) create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults) @@ -93,7 +94,7 @@ class octavia::worker ( package { 'octavia-worker': ensure => $package_ensure, - name => $::octavia::params::worker_package_name, + name => $octavia::params::worker_package_name, tag => ['openstack', 'octavia-package'], } @@ -106,7 +107,7 @@ class octavia::worker ( service { 'octavia-worker': ensure => $service_ensure, - name => $::octavia::params::worker_service_name, + name => $octavia::params::worker_service_name, enable => $enabled, hasstatus => true, hasrestart => true, @@ -114,7 +115,7 @@ class octavia::worker ( } } - if $manage_keygen and ! $::octavia::controller::enable_ssh_access { + if $manage_keygen and ! $octavia::controller::enable_ssh_access { fail('SSH key management cannot be enabled when SSH key access is disabled') } @@ -122,29 +123,29 @@ class octavia::worker ( exec {'create_amp_key_dir': path => ['/bin', '/usr/bin'], command => "mkdir -p ${key_path}", - creates => $key_path + creates => $key_path, } file { 'amp_key_dir': ensure => directory, path => $key_path, mode => '0700', - group => $::octavia::params::group, - owner => $::octavia::params::user + group => $octavia::params::group, + owner => $octavia::params::user, } - ssh_keygen { $::octavia::controller::amp_ssh_key_name: - user => $::octavia::params::user, + ssh_keygen { $octavia::controller::amp_ssh_key_name: + user => $octavia::params::user, type => $ssh_key_type, bits => $ssh_key_bits, - filename => "${key_path}/${::octavia::controller::amp_ssh_key_name}", - comment => 'Used for Octavia Service VM' + filename => "${key_path}/${octavia::controller::amp_ssh_key_name}", + comment => 'Used for Octavia Service VM', } Anchor['octavia::config::begin'] -> Exec['create_amp_key_dir'] -> File['amp_key_dir'] - -> Ssh_keygen[$::octavia::controller::amp_ssh_key_name] + -> Ssh_keygen[$octavia::controller::amp_ssh_key_name] -> Anchor['octavia::config::end'] } diff --git a/manifests/wsgi/apache.pp b/manifests/wsgi/apache.pp index da1242ea..8a0c65a7 100644 --- a/manifests/wsgi/apache.pp +++ b/manifests/wsgi/apache.pp @@ -107,11 +107,11 @@ # # [*wsgi_script_dir*] # (Optional) The directory to install the WSGI script for apache to read. -# Defaults to $::octavia::params::octavia_wsgi_script_dir +# Defaults to $octavia::params::octavia_wsgi_script_dir # # [*wsgi_script_source*] # (Optional) The location of the octavia WSGI script. -# Defaults to $::octavia::params::octavia_wsgi_script_source +# Defaults to $octavia::params::octavia_wsgi_script_source # # [*headers*] # (Optional) Headers for the vhost. @@ -156,8 +156,8 @@ class octavia::wsgi::apache ( $error_log_pipe = undef, $error_log_syslog = undef, $custom_wsgi_process_options = {}, - $wsgi_script_dir = $::octavia::params::octavia_wsgi_script_path, - $wsgi_script_source = $::octavia::params::octavia_wsgi_script_source, + $wsgi_script_dir = $octavia::params::octavia_wsgi_script_path, + $wsgi_script_source = $octavia::params::octavia_wsgi_script_source, $headers = undef, $request_headers = undef, $vhost_custom_fragment = undef, @@ -170,7 +170,7 @@ class octavia::wsgi::apache ( openstacklib::wsgi::apache { 'octavia_wsgi': bind_host => $bind_host, bind_port => $port, - group => $::octavia::params::group, + group => $octavia::params::group, path => $path, priority => $priority, servername => $servername, @@ -183,7 +183,7 @@ class octavia::wsgi::apache ( ssl_crl_path => $ssl_crl_path, ssl_key => $ssl_key, threads => $threads, - user => $::octavia::params::user, + user => $octavia::params::user, vhost_custom_fragment => $vhost_custom_fragment, workers => $workers, wsgi_daemon_process => 'octavia',