openstack
/
puppet-pacemaker
Code Issues Proposed changes

Fix params in pcmk remote 

The pacemaker::remote class does not inherit from the pacemaker class
which means that it has to explicity reference pacemaker::params::*
variables and cannot directly reference them as pacemaker::* vars.

This fixes errors like:
puppet-user[13745]: Error: Validation of File_line[pcsd_bind_addr]
  failed: path is a required attribute (file: /etc/puppet/modules/pacemaker/manifests/remote.pp, line: 89)

Related-Bug: #1861668

Change-Id: I393fc032314139dcd4254dc66a4f594ca4fe2891
This commit is contained in:
Michele Baldessari 2020-02-03 08:50:42 +01:00
parent d0968da947
commit 83d23b3f34
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
manifests/remote.pp
View File

@ -87,7 +87,7 @@ class pacemaker::remote (
if $pcsd_bind_addr != undef { if $pcsd_bind_addr != undef {
file_line { 'pcsd_bind_addr': file_line { 'pcsd_bind_addr':
path => $::pacemaker::pcsd_sysconfig, path => $::pacemaker::params::pcsd_sysconfig,
line => "PCSD_BIND_ADDR='${pcsd_bind_addr}'", line => "PCSD_BIND_ADDR='${pcsd_bind_addr}'",
match => '^PCSD_BIND_ADDR=', match => '^PCSD_BIND_ADDR=',
require => Class['::pacemaker::install'], require => Class['::pacemaker::install'],
@ -109,7 +109,7 @@ class pacemaker::remote (
if $tls_priorities != undef { if $tls_priorities != undef {
file_line { 'tls_priorities': file_line { 'tls_priorities':
path => $::pacemaker::pcmk_sysconfig, path => $::pacemaker::params::pcmk_sysconfig,
line => "PCMK_tls_priorities=${tls_priorities}", line => "PCMK_tls_priorities=${tls_priorities}",
match => '^PCMK_tls_priorities=', match => '^PCMK_tls_priorities=',
require => Class['::pacemaker::install'], require => Class['::pacemaker::install'],