From f08d83de05ba4303588e0ba40e240fb1cefae86a Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 11 May 2021 21:02:07 +0900 Subject: [PATCH] Fix lint errors with the latest lint packages This change fixes the lint errors detected since we removed pins of lint packages. Note that this change also replaces absolute name used to call the tripleo::stunnel::service_proxy resource type, which is not yet detected by the latest lint rules. Closes-Bug: #1928079 Change-Id: I12ba801db92cb3df1d05f14f4c150ac765f0b874 --- manifests/host/liquidio/compute.pp | 4 ---- manifests/profile/base/database/mysql.pp | 2 +- manifests/profile/base/database/redis.pp | 6 +++--- manifests/profile/base/glance/api.pp | 4 ++-- manifests/profile/base/haproxy.pp | 2 +- manifests/profile/pacemaker/database/mysql.pp | 2 +- manifests/profile/pacemaker/database/mysql_bundle.pp | 2 +- manifests/profile/pacemaker/database/redis.pp | 10 +++++----- manifests/profile/pacemaker/database/redis_bundle.pp | 8 ++++---- manifests/profile/pacemaker/rabbitmq.pp | 4 ++-- manifests/profile/pacemaker/rabbitmq_bundle.pp | 4 ++-- 11 files changed, 22 insertions(+), 26 deletions(-) diff --git a/manifests/host/liquidio/compute.pp b/manifests/host/liquidio/compute.pp index 512bfa768..20fea92bd 100644 --- a/manifests/host/liquidio/compute.pp +++ b/manifests/host/liquidio/compute.pp @@ -8,10 +8,6 @@ # (Optional) The current step of the deployment # Defaults to hiera('step') # -# [*controller_node_ip*] -# (Optional) controller node ip, contains either ovn or openstack controller -# ip. -# # [*tenant_subnet*] # (required) Tenant network's ip of the compute node # Defaults to hiera('tenant') diff --git a/manifests/profile/base/database/mysql.pp b/manifests/profile/base/database/mysql.pp index 768673ded..72f18b9c2 100644 --- a/manifests/profile/base/database/mysql.pp +++ b/manifests/profile/base/database/mysql.pp @@ -221,7 +221,7 @@ class tripleo::profile::base::database::mysql ( } if $step >= 2 and $sync_db { - Class['::mysql::server'] -> Mysql_database<||> + Class['mysql::server'] -> Mysql_database<||> if ($manage_resources) { # the mysql module handles password for user 'root@localhost', but it # doesn't modify 'root@%'. So make sure this user password is managed diff --git a/manifests/profile/base/database/redis.pp b/manifests/profile/base/database/redis.pp index 41a2a777c..764136270 100644 --- a/manifests/profile/base/database/redis.pp +++ b/manifests/profile/base/database/redis.pp @@ -93,13 +93,13 @@ class tripleo::profile::base::database::redis ( include tripleo::stunnel - ::tripleo::stunnel::service_proxy { 'redis': + tripleo::stunnel::service_proxy { 'redis': accept_host => $tls_proxy_bind_ip, accept_port => $tls_proxy_port, connect_port => $tls_proxy_port, certificate => $tls_certfile, key => $tls_keyfile, - notify => Class['::redis'], + notify => Class['redis'], } } if downcase($redis_short_bootstrap_node_name) == $::hostname { @@ -112,7 +112,7 @@ class tripleo::profile::base::database::redis ( } if count($redis_node_ips) > 1 { - Class['::tripleo::redis_notification'] -> Service['redis-sentinel'] + Class['tripleo::redis_notification'] -> Service['redis-sentinel'] include redis::sentinel include tripleo::redis_notification } diff --git a/manifests/profile/base/glance/api.pp b/manifests/profile/base/glance/api.pp index 286576131..4a598b81a 100644 --- a/manifests/profile/base/glance/api.pp +++ b/manifests/profile/base/glance/api.pp @@ -188,13 +188,13 @@ class tripleo::profile::base::glance::api ( $tls_certfile = $certificates_specs["httpd-${glance_network}"]['service_certificate'] $tls_keyfile = $certificates_specs["httpd-${glance_network}"]['service_key'] - ::tripleo::tls_proxy { 'glance-api': + tripleo::tls_proxy { 'glance-api': servername => $tls_proxy_fqdn, ip => $tls_proxy_bind_ip, port => $tls_proxy_port, tls_cert => $tls_certfile, tls_key => $tls_keyfile, - notify => Class['::glance::api'], + notify => Class['glance::api'], } include tripleo::profile::base::apache } diff --git a/manifests/profile/base/haproxy.pp b/manifests/profile/base/haproxy.pp index 881b45a05..5f928d2df 100644 --- a/manifests/profile/base/haproxy.pp +++ b/manifests/profile/base/haproxy.pp @@ -67,7 +67,7 @@ class tripleo::profile::base::haproxy ( path => ['/usr/bin', '/usr/sbin'], refreshonly => true, onlyif => 'systemctl is-active haproxy | grep -q active', - subscribe => Class['::haproxy'] + subscribe => Class['haproxy'] } Haproxy::Listen<||> ~> Exec['haproxy-reload'] Haproxy::Balancermember<||> ~> Exec['haproxy-reload'] diff --git a/manifests/profile/pacemaker/database/mysql.pp b/manifests/profile/pacemaker/database/mysql.pp index c60efd1a5..f2eedfa39 100644 --- a/manifests/profile/pacemaker/database/mysql.pp +++ b/manifests/profile/pacemaker/database/mysql.pp @@ -269,7 +269,7 @@ class tripleo::profile::pacemaker::database::mysql ( score => 0, expression => ['galera-role eq true'], }, - require => [Class['::mysql::server'], + require => [Class['mysql::server'], Pacemaker::Property['galera-role-node-property']], notify => Exec['galera-ready'], } diff --git a/manifests/profile/pacemaker/database/mysql_bundle.pp b/manifests/profile/pacemaker/database/mysql_bundle.pp index d9994d2e9..b459d2432 100644 --- a/manifests/profile/pacemaker/database/mysql_bundle.pp +++ b/manifests/profile/pacemaker/database/mysql_bundle.pp @@ -512,7 +512,7 @@ MYSQL_HOST=localhost\n", expression => ['galera-role eq true'], }, bundle => 'galera-bundle', - require => [Class['::mysql::server']], + require => [Class['mysql::server']], before => Exec['galera-ready'], force => $force_ocf, } diff --git a/manifests/profile/pacemaker/database/redis.pp b/manifests/profile/pacemaker/database/redis.pp index 136d5b137..b145d2ec5 100644 --- a/manifests/profile/pacemaker/database/redis.pp +++ b/manifests/profile/pacemaker/database/redis.pp @@ -147,20 +147,20 @@ class tripleo::profile::pacemaker::database::redis ( include tripleo::stunnel # encrypted endpoint for incoming redis service - ::tripleo::stunnel::service_proxy { 'redis': + tripleo::stunnel::service_proxy { 'redis': accept_host => $tls_proxy_bind_ip, accept_port => $tls_proxy_port, connect_host => $tls_tunnel_local_name, connect_port => $tls_proxy_port, certificate => $tls_certfile, key => $tls_keyfile, - notify => Class['::redis'], + notify => Class['redis'], } # encrypted endpoints for outgoing redis replication traffic $redis_peers = $replication_tuples.filter |$tuple| {$tuple[1] != $tls_proxy_bind_ip} $redis_peers.each |$tuple| { - ::tripleo::stunnel::service_proxy { "redis_peer_${tuple[2]}": + tripleo::stunnel::service_proxy { "redis_peer_${tuple[2]}": client => 'yes', accept_host => $tls_tunnel_local_name, accept_port => $tuple[2], @@ -168,7 +168,7 @@ class tripleo::profile::pacemaker::database::redis ( connect_port => $tls_proxy_port, certificate => $tls_certfile, key => $tls_keyfile, - notify => Class['::redis'], + notify => Class['redis'], } } @@ -241,7 +241,7 @@ slave-announce-port ${local_tuple[0][2]} score => 0, expression => ['redis-role eq true'], }, - require => [Class['::redis'], + require => [Class['redis'], Pacemaker::Property['redis-role-node-property']], } } diff --git a/manifests/profile/pacemaker/database/redis_bundle.pp b/manifests/profile/pacemaker/database/redis_bundle.pp index 559ab45d7..6ee76ee47 100644 --- a/manifests/profile/pacemaker/database/redis_bundle.pp +++ b/manifests/profile/pacemaker/database/redis_bundle.pp @@ -188,20 +188,20 @@ class tripleo::profile::pacemaker::database::redis_bundle ( include tripleo::stunnel # encrypted endpoint for incoming redis service - ::tripleo::stunnel::service_proxy { 'redis': + tripleo::stunnel::service_proxy { 'redis': accept_host => $tls_proxy_bind_ip, accept_port => $tls_proxy_port, connect_host => $tls_tunnel_local_name, connect_port => $tls_proxy_port, certificate => $tls_certfile, key => $tls_keyfile, - notify => Class['::redis'], + notify => Class['redis'], } # encrypted endpoints for outgoing redis replication traffic $redis_peers = $replication_tuples.filter |$tuple| {$tuple[1] != $tls_proxy_bind_ip} $redis_peers.each |$tuple| { - ::tripleo::stunnel::service_proxy { "redis_peer_${tuple[2]}": + tripleo::stunnel::service_proxy { "redis_peer_${tuple[2]}": client => 'yes', accept_host => $tls_tunnel_local_name, accept_port => $tuple[2], @@ -209,7 +209,7 @@ class tripleo::profile::pacemaker::database::redis_bundle ( connect_port => $tls_proxy_port, certificate => $tls_certfile, key => $tls_keyfile, - notify => Class['::redis'], + notify => Class['redis'], } } diff --git a/manifests/profile/pacemaker/rabbitmq.pp b/manifests/profile/pacemaker/rabbitmq.pp index 03710dc91..d615ed155 100644 --- a/manifests/profile/pacemaker/rabbitmq.pp +++ b/manifests/profile/pacemaker/rabbitmq.pp @@ -101,7 +101,7 @@ class tripleo::profile::pacemaker::rabbitmq ( mode => '0400', content => $erlang_cookie, replace => true, - require => Class['::rabbitmq'], + require => Class['rabbitmq'], } if $step >= 1 and $pacemaker_master and hiera('stack_action') == 'UPDATE' { @@ -142,7 +142,7 @@ class tripleo::profile::pacemaker::rabbitmq ( score => 0, expression => ['rabbitmq-role eq true'], }, - require => [Class['::rabbitmq'], + require => [Class['rabbitmq'], Pacemaker::Property['rabbitmq-role-node-property']], notify => Exec['rabbitmq-ready'], } diff --git a/manifests/profile/pacemaker/rabbitmq_bundle.pp b/manifests/profile/pacemaker/rabbitmq_bundle.pp index c7e21dc1d..7c96d8e1c 100644 --- a/manifests/profile/pacemaker/rabbitmq_bundle.pp +++ b/manifests/profile/pacemaker/rabbitmq_bundle.pp @@ -175,7 +175,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle ( mode => '0400', content => $erlang_cookie, replace => true, - require => Class['::rabbitmq'], + require => Class['rabbitmq'], } file_line { 'rabbitmq-pamd-systemd': @@ -339,7 +339,7 @@ class tripleo::profile::pacemaker::rabbitmq_bundle ( expression => ['rabbitmq-role eq true'], }, bundle => 'rabbitmq-bundle', - require => [Class['::rabbitmq'], + require => [Class['rabbitmq'], Pacemaker::Resource::Bundle['rabbitmq-bundle']], before => Exec['rabbitmq-ready'], force => $force_ocf,