openstack/puppet-octavia
Code Issues Proposed changes

Prepare for new lint plugins

Browse Source 
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 <kajinamit@oss.nttdata.com>
This commit is contained in:
Takashi Kajinami
2025-08-15 20:09:02 +09:00
parent 73218fa586
commit fda28025ab
15 changed files with 49 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
manifests/api.pp
View File

@@ -17,7 +17,7 @@
# service, and you must use another class to configure that # service, and you must use another class to configure that
# web service. For example, use class { 'octavia::wsgi::apache'...} # web service. For example, use class { 'octavia::wsgi::apache'...}
# to make octavia-api be a web app using apache mod_wsgi. # 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*] # [*host*]
# (optional) The octavia api bind address. # (optional) The octavia api bind address.
@@ -122,7 +122,7 @@
class octavia::api ( class octavia::api (
Boolean $enabled = true, Boolean $enabled = true,
Boolean $manage_service = true, Boolean $manage_service = true,
$service_name = $::octavia::params::api_service_name, $service_name = $octavia::params::api_service_name,
$host = '0.0.0.0', $host = '0.0.0.0',
$port = '9876', $port = '9876',
$package_ensure = 'present', $package_ensure = 'present',
@@ -159,7 +159,7 @@ class octavia::api (
package { 'octavia-api': package { 'octavia-api':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::api_package_name, name => $octavia::params::api_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }
@@ -170,10 +170,10 @@ class octavia::api (
$service_ensure = 'stopped' $service_ensure = 'stopped'
} }
if $service_name == $::octavia::params::api_service_name { if $service_name == $octavia::params::api_service_name {
service { 'octavia-api': service { 'octavia-api':
ensure => $service_ensure, ensure => $service_ensure,
name => $::octavia::params::api_service_name, name => $octavia::params::api_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
@@ -186,7 +186,7 @@ class octavia::api (
} elsif $service_name == 'httpd' { } elsif $service_name == 'httpd' {
service { 'octavia-api': service { 'octavia-api':
ensure => 'stopped', ensure => 'stopped',
name => $::octavia::params::api_service_name, name => $octavia::params::api_service_name,
enable => false, enable => false,
tag => 'octavia-service', tag => 'octavia-service',
} }

4
manifests/certificates.pp
View File

@@ -135,8 +135,8 @@ class octavia::certificates (
Optional[String[1]] $client_ca_source = undef, Optional[String[1]] $client_ca_source = undef,
Optional[String[1]] $client_cert_data = undef, Optional[String[1]] $client_cert_data = undef,
Optional[String[1]] $client_cert_source = undef, Optional[String[1]] $client_cert_source = undef,
$file_permission_owner = $::octavia::params::user, $file_permission_owner = $octavia::params::user,
$file_permission_group = $::octavia::params::group, $file_permission_group = $octavia::params::group,
) inherits octavia::params { ) inherits octavia::params {
include octavia::deps include octavia::deps

2
manifests/client.pp
View File

@@ -16,7 +16,7 @@ class octavia::client (
package { 'python-octaviaclient': package { 'python-octaviaclient':
ensure => $ensure, ensure => $ensure,
name => $::octavia::params::client_package_name, name => $octavia::params::client_package_name,
tag => ['openstack', 'openstackclient'], tag => ['openstack', 'openstackclient'],
} }
include openstacklib::openstackclient include openstacklib::openstackclient

2
manifests/db/sync.pp
View File

@@ -23,7 +23,7 @@ class octavia::db::sync(
exec { 'octavia-db-sync': exec { 'octavia-db-sync':
command => "octavia-db-manage upgrade head ${extra_params}", command => "octavia-db-manage upgrade head ${extra_params}",
path => '/usr/bin', path => '/usr/bin',
user => $::octavia::params::user, user => $octavia::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

2
manifests/db/sync_persistence.pp
View File

@@ -23,7 +23,7 @@ class octavia::db::sync_persistence(
exec { 'octavia-db-sync-persistence': exec { 'octavia-db-sync-persistence':
command => "octavia-db-manage upgrade_persistence ${extra_params}", command => "octavia-db-manage upgrade_persistence ${extra_params}",
path => '/usr/bin', path => '/usr/bin',
user => $::octavia::params::user, user => $octavia::params::user,
refreshonly => true, refreshonly => true,
try_sleep => 5, try_sleep => 5,
tries => 10, tries => 10,

6
manifests/driver_agent.pp
View File

@@ -91,7 +91,7 @@ class octavia::driver_agent (
package { 'octavia-driver-agent': package { 'octavia-driver-agent':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::driver_agent_package_name, name => $octavia::params::driver_agent_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }
@@ -104,11 +104,11 @@ class octavia::driver_agent (
service { 'octavia-driver-agent': service { 'octavia-driver-agent':
ensure => $service_ensure, ensure => $service_ensure,
name => $::octavia::params::driver_agent_service_name, name => $octavia::params::driver_agent_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,
tag => ['octavia-service'] tag => ['octavia-service'],
} }
} }

4
manifests/health_manager.pp
View File

@@ -72,7 +72,7 @@ class octavia::health_manager (
package { 'octavia-health-manager': package { 'octavia-health-manager':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::health_manager_package_name, name => $octavia::params::health_manager_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }
@@ -85,7 +85,7 @@ class octavia::health_manager (
service { 'octavia-health-manager': service { 'octavia-health-manager':
ensure => $service_ensure, ensure => $service_ensure,
name => $::octavia::params::health_manager_service_name, name => $octavia::params::health_manager_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,

4
manifests/housekeeping.pp
View File

@@ -55,7 +55,7 @@ class octavia::housekeeping (
package { 'octavia-housekeeping': package { 'octavia-housekeeping':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::housekeeping_package_name, name => $octavia::params::housekeeping_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }
@@ -68,7 +68,7 @@ class octavia::housekeeping (
service { 'octavia-housekeeping': service { 'octavia-housekeeping':
ensure => $service_ensure, ensure => $service_ensure,
name => $::octavia::params::housekeeping_service_name, name => $octavia::params::housekeeping_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => true, hasrestart => true,

2
manifests/init.pp
View File

@@ -226,7 +226,7 @@ class octavia (
package { 'octavia': package { 'octavia':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::common_package_name, name => $octavia::params::common_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }

2
manifests/policy.pp
View File

@@ -62,7 +62,7 @@ class octavia::policy (
policies => $policies, policies => $policies,
policy_path => $policy_path, policy_path => $policy_path,
file_user => 'root', file_user => 'root',
file_group => $::octavia::params::group, file_group => $octavia::params::group,
file_format => 'yaml', file_format => 'yaml',
purge_config => $purge_config, purge_config => $purge_config,
tag => 'octavia', tag => 'octavia',

2
manifests/provider/ovn.pp
View File

@@ -75,7 +75,7 @@ class octavia::provider::ovn (
package { 'ovn-octavia-provider': package { 'ovn-octavia-provider':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::ovn_provider_package_name, name => $octavia::params::ovn_provider_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }

4
manifests/roles.pp
View File

@@ -17,12 +17,12 @@ class octavia::roles (
'load-balancer_member', 'load-balancer_member',
'load-balancer_quota_admin', 'load-balancer_quota_admin',
'load-balancer_admin', 'load-balancer_admin',
'admin' 'admin',
] ]
) { ) {
if $role_names { if $role_names {
keystone_role { $role_names: keystone_role { $role_names:
ensure => present ensure => present,
} }
} }
} }

6
manifests/task_flow.pp
View File

@@ -157,7 +157,7 @@ class octavia::task_flow (
case $jobboard_backend_driver { case $jobboard_backend_driver {
'zookeeper_taskflow_driver': { 'zookeeper_taskflow_driver': {
stdlib::ensure_packages('python-kazoo', { stdlib::ensure_packages('python-kazoo', {
name => $::octavia::params::python_kazoo_package_name, name => $octavia::params::python_kazoo_package_name,
ensure => $package_ensure, ensure => $package_ensure,
tag => ['openstack'], tag => ['openstack'],
}) })
@@ -167,7 +167,7 @@ class octavia::task_flow (
} }
'etcd_taskflow_driver': { 'etcd_taskflow_driver': {
stdlib::ensure_packages('python-etcd3gw', { stdlib::ensure_packages('python-etcd3gw', {
name => $::octavia::params::python_etcd3gw_package_name, name => $octavia::params::python_etcd3gw_package_name,
ensure => $package_ensure, ensure => $package_ensure,
tag => ['openstack'], tag => ['openstack'],
}) })
@@ -177,7 +177,7 @@ class octavia::task_flow (
} }
default: { default: {
stdlib::ensure_packages('python-redis', { stdlib::ensure_packages('python-redis', {
name => $::octavia::params::python_redis_package_name, name => $octavia::params::python_redis_package_name,
ensure => $package_ensure, ensure => $package_ensure,
tag => ['openstack'], tag => ['openstack'],
}) })

33
manifests/worker.pp
View File

@@ -70,10 +70,11 @@ class octavia::worker (
include octavia::controller include octavia::controller
if $manage_nova_flavor { if $manage_nova_flavor {
$octavia_flavor = { "octavia_${::octavia::controller::amp_flavor_id}" => $octavia_flavor = {
{ 'id' => $::octavia::controller::amp_flavor_id, "octavia_${octavia::controller::amp_flavor_id}" => {
'project_name' => $amp_project_name 'id' => $octavia::controller::amp_flavor_id,
} 'project_name' => $amp_project_name,
},
} }
$octavia_flavor_defaults = { $octavia_flavor_defaults = {
@@ -82,7 +83,7 @@ class octavia::worker (
'disk' => '2', 'disk' => '2',
'vcpus' => '1', 'vcpus' => '1',
'is_public' => false, 'is_public' => false,
'tag' => ['octavia'] 'tag' => ['octavia'],
} }
$nova_flavor_defaults = stdlib::merge($octavia_flavor_defaults, $nova_flavor_config) $nova_flavor_defaults = stdlib::merge($octavia_flavor_defaults, $nova_flavor_config)
create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults) create_resources('nova_flavor', $octavia_flavor, $nova_flavor_defaults)
@@ -93,7 +94,7 @@ class octavia::worker (
package { 'octavia-worker': package { 'octavia-worker':
ensure => $package_ensure, ensure => $package_ensure,
name => $::octavia::params::worker_package_name, name => $octavia::params::worker_package_name,
tag => ['openstack', 'octavia-package'], tag => ['openstack', 'octavia-package'],
} }
@@ -106,7 +107,7 @@ class octavia::worker (
service { 'octavia-worker': service { 'octavia-worker':
ensure => $service_ensure, ensure => $service_ensure,
name => $::octavia::params::worker_service_name, name => $octavia::params::worker_service_name,
enable => $enabled, enable => $enabled,
hasstatus => true, hasstatus => true,
hasrestart => 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') 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': exec {'create_amp_key_dir':
path => ['/bin', '/usr/bin'], path => ['/bin', '/usr/bin'],
command => "mkdir -p ${key_path}", command => "mkdir -p ${key_path}",
creates => $key_path creates => $key_path,
} }
file { 'amp_key_dir': file { 'amp_key_dir':
ensure => directory, ensure => directory,
path => $key_path, path => $key_path,
mode => '0700', mode => '0700',
group => $::octavia::params::group, group => $octavia::params::group,
owner => $::octavia::params::user owner => $octavia::params::user,
} }
ssh_keygen { $::octavia::controller::amp_ssh_key_name: ssh_keygen { $octavia::controller::amp_ssh_key_name:
user => $::octavia::params::user, user => $octavia::params::user,
type => $ssh_key_type, type => $ssh_key_type,
bits => $ssh_key_bits, bits => $ssh_key_bits,
filename => "${key_path}/${::octavia::controller::amp_ssh_key_name}", filename => "${key_path}/${octavia::controller::amp_ssh_key_name}",
comment => 'Used for Octavia Service VM' comment => 'Used for Octavia Service VM',
} }
Anchor['octavia::config::begin'] Anchor['octavia::config::begin']
-> Exec['create_amp_key_dir'] -> Exec['create_amp_key_dir']
-> File['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'] -> Anchor['octavia::config::end']
} }

12
manifests/wsgi/apache.pp
View File

@@ -107,11 +107,11 @@
# #
# [*wsgi_script_dir*] # [*wsgi_script_dir*]
# (Optional) The directory to install the WSGI script for apache to read. # (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*] # [*wsgi_script_source*]
# (Optional) The location of the octavia WSGI script. # (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*] # [*headers*]
# (Optional) Headers for the vhost. # (Optional) Headers for the vhost.
@@ -156,8 +156,8 @@ class octavia::wsgi::apache (
$error_log_pipe = undef, $error_log_pipe = undef,
$error_log_syslog = undef, $error_log_syslog = undef,
$custom_wsgi_process_options = {}, $custom_wsgi_process_options = {},
$wsgi_script_dir = $::octavia::params::octavia_wsgi_script_path, $wsgi_script_dir = $octavia::params::octavia_wsgi_script_path,
$wsgi_script_source = $::octavia::params::octavia_wsgi_script_source, $wsgi_script_source = $octavia::params::octavia_wsgi_script_source,
$headers = undef, $headers = undef,
$request_headers = undef, $request_headers = undef,
$vhost_custom_fragment = undef, $vhost_custom_fragment = undef,
@@ -170,7 +170,7 @@ class octavia::wsgi::apache (
openstacklib::wsgi::apache { 'octavia_wsgi': openstacklib::wsgi::apache { 'octavia_wsgi':
bind_host => $bind_host, bind_host => $bind_host,
bind_port => $port, bind_port => $port,
group => $::octavia::params::group, group => $octavia::params::group,
path => $path, path => $path,
priority => $priority, priority => $priority,
servername => $servername, servername => $servername,
@@ -183,7 +183,7 @@ class octavia::wsgi::apache (
ssl_crl_path => $ssl_crl_path, ssl_crl_path => $ssl_crl_path,
ssl_key => $ssl_key, ssl_key => $ssl_key,
threads => $threads, threads => $threads,
user => $::octavia::params::user, user => $octavia::params::user,
vhost_custom_fragment => $vhost_custom_fragment, vhost_custom_fragment => $vhost_custom_fragment,
workers => $workers, workers => $workers,
wsgi_daemon_process => 'octavia', wsgi_daemon_process => 'octavia',