Merge "RabbitMQ: Simplify how to suppress error from pam_unix.so"
This commit is contained in:
commit
0abec3fe92
@ -216,16 +216,13 @@ class tripleo::profile::pacemaker::rabbitmq_bundle (
|
|||||||
match => '^-session\s+optional\s+pam_systemd.so',
|
match => '^-session\s+optional\s+pam_systemd.so',
|
||||||
match_for_absence => true,
|
match_for_absence => true,
|
||||||
}
|
}
|
||||||
# Note that once we move to RHEL8 where pam_unix.so supports the quiet option
|
file_line { 'rabbitmq-pamd-quiet':
|
||||||
# we can just add quiet to the pam_unix option for the session module and remove this one
|
|
||||||
file_line { 'rabbitmq-pamd-succeed':
|
|
||||||
ensure => present,
|
ensure => present,
|
||||||
path => '/etc/pam.d/system-auth',
|
path => '/etc/pam.d/system-auth',
|
||||||
line => 'session sufficient pam_succeed_if.so quiet_success user ingroup rabbitmq',
|
line => 'session required pam_unix.so quiet',
|
||||||
after => '^session.*pam_limits.so'
|
match => '^session\s+required\s+pam_unix.so$'
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
if $step >= 2 {
|
if $step >= 2 {
|
||||||
if $pacemaker_master {
|
if $pacemaker_master {
|
||||||
if $rpc_scheme == 'rabbit' {
|
if $rpc_scheme == 'rabbit' {
|
||||||
|
Loading…
Reference in New Issue
Block a user