openstack
/
puppet-pacemaker
Code Issues Proposed changes

Fix up package relationship in generated stonith manifests 

In last revision of I8be5d5d1a9894b0e2915459b10ea2feed703ba8e
there was a typo in the generator that made the relation ships
useless. While it does not break all too much in the tripleo case,
this should be fixed.

Change-Id: I58ceeecba597f7455fae87773257aca993e4c8ac
This commit is contained in:
Michele Baldessari 2017-09-21 20:51:20 +02:00
parent 957947c22d
commit 1721dd71bb
30 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
agent_generator/agent_generator.rb
View File

@ -125,7 +125,7 @@ define pacemaker::stonith::#{@parser.getAgentName} (
package { '#{@parser.getPackageName}':
ensure => installed,
}
Package['#{@parser.getPackageName}'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['#{@parser.getPackageName}'] -> Pcmk_stonith["stonith-#{@parser.getAgentName}-${safe_title}"]
}
pcmk_stonith { "stonith-#{@parser.getAgentName}-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_apc.pp
View File

@ -257,7 +257,7 @@ define pacemaker::stonith::fence_apc (
package { 'fence-agents-apc':
ensure => installed,
}
Package['fence-agents-apc'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-apc'] -> Pcmk_stonith["stonith-fence_apc-${safe_title}"]
}
pcmk_stonith { "stonith-fence_apc-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_apc_snmp.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_apc_snmp (
package { 'fence-agents-apc-snmp':
ensure => installed,
}
Package['fence-agents-apc-snmp'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-apc-snmp'] -> Pcmk_stonith["stonith-fence_apc_snmp-${safe_title}"]
}
pcmk_stonith { "stonith-fence_apc_snmp-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_bladecenter.pp
View File

@ -257,7 +257,7 @@ define pacemaker::stonith::fence_bladecenter (
package { 'fence-agents-bladecenter':
ensure => installed,
}
Package['fence-agents-bladecenter'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-bladecenter'] -> Pcmk_stonith["stonith-fence_bladecenter-${safe_title}"]
}
pcmk_stonith { "stonith-fence_bladecenter-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_brocade.pp
View File

@ -249,7 +249,7 @@ define pacemaker::stonith::fence_brocade (
package { 'fence-agents-brocade':
ensure => installed,
}
Package['fence-agents-brocade'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-brocade'] -> Pcmk_stonith["stonith-fence_brocade-${safe_title}"]
}
pcmk_stonith { "stonith-fence_brocade-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_cisco_mds.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_cisco_mds (
package { 'fence-agents-cisco-mds':
ensure => installed,
}
Package['fence-agents-cisco-mds'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-cisco-mds'] -> Pcmk_stonith["stonith-fence_cisco_mds-${safe_title}"]
}
pcmk_stonith { "stonith-fence_cisco_mds-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_cisco_ucs.pp
View File

@ -257,7 +257,7 @@ define pacemaker::stonith::fence_cisco_ucs (
package { 'fence-agents-cisco-ucs':
ensure => installed,
}
Package['fence-agents-cisco-ucs'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-cisco-ucs'] -> Pcmk_stonith["stonith-fence_cisco_ucs-${safe_title}"]
}
pcmk_stonith { "stonith-fence_cisco_ucs-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_drac5.pp
View File

@ -257,7 +257,7 @@ define pacemaker::stonith::fence_drac5 (
package { 'fence-agents-drac5':
ensure => installed,
}
Package['fence-agents-drac5'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-drac5'] -> Pcmk_stonith["stonith-fence_drac5-${safe_title}"]
}
pcmk_stonith { "stonith-fence_drac5-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_eaton_snmp.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_eaton_snmp (
package { 'fence-agents-eaton-snmp':
ensure => installed,
}
Package['fence-agents-eaton-snmp'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-eaton-snmp'] -> Pcmk_stonith["stonith-fence_eaton_snmp-${safe_title}"]
}
pcmk_stonith { "stonith-fence_eaton_snmp-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_eps.pp
View File

@ -225,7 +225,7 @@ define pacemaker::stonith::fence_eps (
package { 'fence-agents-eps':
ensure => installed,
}
Package['fence-agents-eps'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-eps'] -> Pcmk_stonith["stonith-fence_eps-${safe_title}"]
}
pcmk_stonith { "stonith-fence_eps-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_hpblade.pp
View File

@ -257,7 +257,7 @@ define pacemaker::stonith::fence_hpblade (
package { 'fence-agents-hpblade':
ensure => installed,
}
Package['fence-agents-hpblade'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-hpblade'] -> Pcmk_stonith["stonith-fence_hpblade-${safe_title}"]
}
pcmk_stonith { "stonith-fence_hpblade-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ibmblade.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_ibmblade (
package { 'fence-agents-ibmblade':
ensure => installed,
}
Package['fence-agents-ibmblade'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ibmblade'] -> Pcmk_stonith["stonith-fence_ibmblade-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ibmblade-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_idrac.pp
View File

@ -185,7 +185,7 @@ define pacemaker::stonith::fence_idrac (
package { 'fence-agents-ipmilan':
ensure => installed,
}
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_idrac-${safe_title}"]
}
pcmk_stonith { "stonith-fence_idrac-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ifmib.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_ifmib (
package { 'fence-agents-ifmib':
ensure => installed,
}
Package['fence-agents-ifmib'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ifmib'] -> Pcmk_stonith["stonith-fence_ifmib-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ifmib-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ilo.pp
View File

@ -241,7 +241,7 @@ define pacemaker::stonith::fence_ilo (
package { 'fence-agents-ilo2':
ensure => installed,
}
Package['fence-agents-ilo2'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ilo2'] -> Pcmk_stonith["stonith-fence_ilo-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ilo-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ilo2.pp
View File

@ -241,7 +241,7 @@ define pacemaker::stonith::fence_ilo2 (
package { 'fence-agents-ilo2':
ensure => installed,
}
Package['fence-agents-ilo2'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ilo2'] -> Pcmk_stonith["stonith-fence_ilo2-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ilo2-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ilo3.pp
View File

@ -185,7 +185,7 @@ define pacemaker::stonith::fence_ilo3 (
package { 'fence-agents-ipmilan':
ensure => installed,
}
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_ilo3-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ilo3-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ilo4.pp
View File

@ -185,7 +185,7 @@ define pacemaker::stonith::fence_ilo4 (
package { 'fence-agents-ipmilan':
ensure => installed,
}
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_ilo4-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ilo4-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ilo_mp.pp
View File

@ -233,7 +233,7 @@ define pacemaker::stonith::fence_ilo_mp (
package { 'fence-agents-ilo-mp':
ensure => installed,
}
Package['fence-agents-ilo-mp'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ilo-mp'] -> Pcmk_stonith["stonith-fence_ilo_mp-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ilo_mp-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_imm.pp
View File

@ -185,7 +185,7 @@ define pacemaker::stonith::fence_imm (
package { 'fence-agents-ipmilan':
ensure => installed,
}
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ipmilan'] -> Pcmk_stonith["stonith-fence_imm-${safe_title}"]
}
pcmk_stonith { "stonith-fence_imm-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_intelmodular.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_intelmodular (
package { 'fence-agents-intelmodular':
ensure => installed,
}
Package['fence-agents-intelmodular'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-intelmodular'] -> Pcmk_stonith["stonith-fence_intelmodular-${safe_title}"]
}
pcmk_stonith { "stonith-fence_intelmodular-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ipdu.pp
View File

@ -273,7 +273,7 @@ define pacemaker::stonith::fence_ipdu (
package { 'fence-agents-ipdu':
ensure => installed,
}
Package['fence-agents-ipdu'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ipdu'] -> Pcmk_stonith["stonith-fence_ipdu-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ipdu-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_ironic.pp
View File

@ -150,7 +150,7 @@ define pacemaker::stonith::fence_ironic (
package { 'fence-agents-ironic':
ensure => installed,
}
Package['fence-agents-ironic'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-ironic'] -> Pcmk_stonith["stonith-fence_ironic-${safe_title}"]
}
pcmk_stonith { "stonith-fence_ironic-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_kdump.pp
View File

@ -129,7 +129,7 @@ define pacemaker::stonith::fence_kdump (
package { 'fence-agents-kdump':
ensure => installed,
}
Package['fence-agents-kdump'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-kdump'] -> Pcmk_stonith["stonith-fence_kdump-${safe_title}"]
}
pcmk_stonith { "stonith-fence_kdump-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_rhevm.pp
View File

@ -249,7 +249,7 @@ define pacemaker::stonith::fence_rhevm (
package { 'fence-agents-rhevm':
ensure => installed,
}
Package['fence-agents-rhevm'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-rhevm'] -> Pcmk_stonith["stonith-fence_rhevm-${safe_title}"]
}
pcmk_stonith { "stonith-fence_rhevm-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_rsb.pp
View File

@ -233,7 +233,7 @@ define pacemaker::stonith::fence_rsb (
package { 'fence-agents-rsb':
ensure => installed,
}
Package['fence-agents-rsb'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-rsb'] -> Pcmk_stonith["stonith-fence_rsb-${safe_title}"]
}
pcmk_stonith { "stonith-fence_rsb-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_scsi.pp
View File

@ -129,7 +129,7 @@ define pacemaker::stonith::fence_scsi (
package { 'fence-agents-scsi':
ensure => installed,
}
Package['fence-agents-scsi'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-scsi'] -> Pcmk_stonith["stonith-fence_scsi-${safe_title}"]
}
pcmk_stonith { "stonith-fence_scsi-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_virt.pp
View File

@ -153,7 +153,7 @@ define pacemaker::stonith::fence_virt (
package { 'fence-virt':
ensure => installed,
}
Package['fence-virt'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-virt'] -> Pcmk_stonith["stonith-fence_virt-${safe_title}"]
}
pcmk_stonith { "stonith-fence_virt-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_vmware_soap.pp
View File

@ -249,7 +249,7 @@ define pacemaker::stonith::fence_vmware_soap (
package { 'fence-agents-vmware-soap':
ensure => installed,
}
Package['fence-agents-vmware-soap'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-vmware-soap'] -> Pcmk_stonith["stonith-fence_vmware_soap-${safe_title}"]
}
pcmk_stonith { "stonith-fence_vmware_soap-${safe_title}":
ensure => $ensure,

2
manifests/stonith/fence_wti.pp
View File

@ -249,7 +249,7 @@ define pacemaker::stonith::fence_wti (
package { 'fence-agents-wti':
ensure => installed,
}
Package['fence-agents-wti'] -> Pcmk_stonith["stonith-fence_ipmilan-${safe_title}"]
Package['fence-agents-wti'] -> Pcmk_stonith["stonith-fence_wti-${safe_title}"]
}
pcmk_stonith { "stonith-fence_wti-${safe_title}":
ensure => $ensure,