openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "Fix lint errors with the latest lint packages"

This commit is contained in:
Zuul 2021-05-14 07:39:43 +00:00 committed by Gerrit Code Review
parent 18eb2a12e9 f08d83de05
commit ade72d51ce
11 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/host/liquidio/compute.pp
View File

@ -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')

2
manifests/profile/base/database/mysql.pp
View File

@ -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

6
manifests/profile/base/database/redis.pp
View File

@ -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
}

4
manifests/profile/base/glance/api.pp
View File

@ -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
}

2
manifests/profile/base/haproxy.pp
View File

@ -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']

2
manifests/profile/pacemaker/database/mysql.pp
View File

@ -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'],
}

2
manifests/profile/pacemaker/database/mysql_bundle.pp
View File

@ -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,
}

10
manifests/profile/pacemaker/database/redis.pp
View File

@ -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']],
}
}

8
manifests/profile/pacemaker/database/redis_bundle.pp
View File

@ -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'],
}
}

4
manifests/profile/pacemaker/rabbitmq.pp
View File

@ -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'],
}

4
manifests/profile/pacemaker/rabbitmq_bundle.pp
View File

@ -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,