openstack
/
puppet-tripleo
Code Issues Proposed changes

Merge "RabbitMQ: Simplify how to suppress error from pam_unix.so"

This commit is contained in:
Zuul 2022-08-24 00:42:57 +00:00 committed by Gerrit Code Review
parent df6cf3a076 ae15e803e0
commit 0abec3fe92
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -216,16 +216,13 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
match => '^-session\s+optional\s+pam_systemd.so',
match_for_absence => true,
}
# Note that once we move to RHEL8 where pam_unix.so supports the quiet option
# we can just add quiet to the pam_unix option for the session module and remove this one
file_line { 'rabbitmq-pamd-succeed':
file_line { 'rabbitmq-pamd-quiet':
ensure => present,
path => '/etc/pam.d/system-auth',
line => 'session sufficient pam_succeed_if.so quiet_success user ingroup rabbitmq',
after => '^session.*pam_limits.so'
line => 'session required pam_unix.so quiet',
match => '^session\s+required\s+pam_unix.so$'
}
if $step >= 2 {
if $pacemaker_master {
if $rpc_scheme == 'rabbit' {