openstack
/
puppet-pacemaker
Code Issues Proposed changes
Browse Source

Only install required/supported fence agents 

This change replaces fence-agents-all package to fence-agents-redfish,
fence-agents-ipmilan, fence-agents-kdump and fence-agents-rhevm.

The same is proposed in
https://review.opendev.org/c/openstack/tripleo-puppet-elements/+/818184

This change also fixes failure in unit tests, caused by the following
warning message shown by the pcs command.

Warning: stonith option 'passwd' is deprecated and should not be used,
use 'password' instead

Closes-Bug: #1955559
Related-Bug: #1955572
Signed-off-by: Chandan Kumar (raukadah) <chkumar@redhat.com>
Change-Id: I8f5c04cea4afb8f46a8da5ab639ac984bac36cca
changes/44/822644/5
Chandan Kumar (raukadah) 5 months ago committed by Takashi Kajinami
parent
81c84d56e8
commit
9f2e6f10a4
6 changed files with 14 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 5
      bindep.txt
  2. 2
      manifests/new/params.pp
  3. 6
      manifests/params.pp
  4. 2
      spec/classes/pacemaker_install_spec.rb
  5. 6
      spec/unit/puppet/provider/cib-orig.xml
  6. 4
      spec/unit/puppet/provider/pcmk_common_spec.rb

5
bindep.txt
Unescape View File

@ -13,7 +13,10 @@ pacemaker-cli-utils [test platform:dpkg]
pacemaker-cli [test platform:rpm]
pcs [test platform:rpm]
pcs [test platform:dpkg]
fence-agents-all [test platform:rpm]
fence-agents-redfish [test platform:rpm]
fence-agents-ipmilan [test platform:rpm]
fence-agents-kdump [test platform:rpm]
fence-agents-rhevm [test platform:rpm]
fence-agents [test platform:dpkg]
pacemaker [test platform:rpm]
pacemaker [test platform:dpkg]

2
manifests/new/params.pp
Unescape View File

@ -8,7 +8,7 @@ class pacemaker::new::params {
$minor = $::os['release']['minor']
if $::os['family'] == 'RedHat' {
$package_list = ['pacemaker', 'pcs', 'fence-agents-all', 'pacemaker-libs']
$package_list = ['pacemaker', 'pcs', 'fence-agents-redfish', 'fence-agents-ipmilan', 'fence-agents-kdump', 'fence-agents-rhevm', 'pacemaker-libs']
$pcsd_mode = true
$cluster_user = 'hacluster'
$cluster_group = 'haclient'

6
manifests/params.pp
Unescape View File

@ -35,14 +35,14 @@ class pacemaker::params {
$pcs_bin = '/sbin/pcs'
$pcsd_sysconfig = '/etc/sysconfig/pcsd'
$pcmk_sysconfig = '/etc/sysconfig/pacemaker'
$package_list = ['pacemaker','pcs','fence-agents-all','pacemaker-libs']
$package_list = ['pacemaker','pcs','fence-agents-redfish','fence-agents-ipmilan','fence-agents-kdump','fence-agents-rhevm','pacemaker-libs']
$pcsd_mode = true
$services_manager = 'systemd'
# Starting with 7.3 we have a separate pacemaker-remote package
if (versioncmp($::os['release']['full'], '7.2') < 1) {
$pcmk_remote_package_list = ['pacemaker','pcs','fence-agents-all','pacemaker-libs']
$pcmk_remote_package_list = ['pacemaker','pcs','fence-agents-redfish','fence-agents-ipmilan','fence-agents-kdump','fence-agents-rhevm','pacemaker-libs']
} else {
$pcmk_remote_package_list = ['pacemaker','pcs','fence-agents-all','pacemaker-libs', 'pacemaker-remote']
$pcmk_remote_package_list = ['pacemaker','pcs','fence-agents-redfish','fence-agents-ipmilan','fence-agents-kdump','fence-agents-rhevm','pacemaker-libs','pacemaker-remote']
}
# Detect pcs 0.10.x versions and use different commands.
# If full version == '8', we're using 8-stream or check if newer than 8.0

2
spec/classes/pacemaker_install_spec.rb
Unescape View File

@ -7,7 +7,7 @@ describe 'pacemaker::new::install', type: :class do
package_list = begin
if facts[:osfamily] == 'RedHat'
%w(pacemaker pcs fence-agents-all pacemaker-libs)
%w(pacemaker pcs fence-agents-redfish fence-agents-ipmilan fence-agents-kdump fence-agents-rhevm pacemaker-libs)
elsif facts[:osfamily] == 'Debian'
if facts[:operatingsystem] == 'Ubuntu' && facts[:operatingsystemmajrelease].to_i >= 16
%w(pacemaker corosync pacemaker-cli-utils resource-agents)

6
spec/unit/puppet/provider/cib-orig.xml
Unescape View File

@ -32,7 +32,7 @@
<primitive class="stonith" id="stonith-fence_ipmilan-stonith-fence-1" type="fence_ipmilan">
<instance_attributes id="stonith-fence_ipmilan-stonith-fence-1-instance_attributes">
<nvpair id="stonith-fence_ipmilan-stonith-fence-1-instance_attributes-ipaddr" name="ipaddr" value="192.0.3.99"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-1-instance_attributes-passwd" name="passwd" value="renVamyep3!"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-1-instance_attributes-password" name="password" value="renVamyep3!"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-1-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="foobar-0"/>
</instance_attributes>
<operations>
@ -42,7 +42,7 @@
<primitive class="stonith" id="stonith-fence_ipmilan-stonith-fence-2" type="fence_ipmilan">
<instance_attributes id="stonith-fence_ipmilan-stonith-fence-2-instance_attributes">
<nvpair id="stonith-fence_ipmilan-stonith-fence-2-instance_attributes-ipaddr" name="ipaddr" value="192.0.2.100"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-2-instance_attributes-passwd" name="passwd" value="renVamyep3!"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-2-instance_attributes-password" name="password" value="renVamyep3!"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-2-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="foobar-1"/>
</instance_attributes>
<operations>
@ -52,7 +52,7 @@
<primitive class="stonith" id="stonith-fence_ipmilan-stonith-fence-3" type="fence_ipmilan">
<instance_attributes id="stonith-fence_ipmilan-stonith-fence-3-instance_attributes">
<nvpair id="stonith-fence_ipmilan-stonith-fence-3-instance_attributes-ipaddr" name="ipaddr" value="192.0.2.101"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-3-instance_attributes-passwd" name="passwd" value="renVamyep3!"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-3-instance_attributes-password" name="password" value="renVamyep3!"/>
<nvpair id="stonith-fence_ipmilan-stonith-fence-3-instance_attributes-pcmk_host_list" name="pcmk_host_list" value="foobar-2"/>
</instance_attributes>
<operations>

4
spec/unit/puppet/provider/pcmk_common_spec.rb
Unescape View File

@ -17,12 +17,12 @@ describe "pcmk_common functions" do
it "pcs_offline noop update" do
expect(pcs_offline('resource update ip-172.16.11.97 cidr_netmask=32', 'cib-noop.xml')).to eq ""
expect(pcs_offline('resource update stonith-fence_ipmilan-stonith-fence-1 passwd=renVamyep3!', 'cib-noop.xml')).to eq ""
expect(pcs_offline('resource update stonith-fence_ipmilan-stonith-fence-1 password=renVamyep3!', 'cib-noop.xml')).to eq ""
end
it "pcs_offline update to resource definition" do
expect(pcs_offline('resource update ip-172.16.11.97 cidr_netmask=31', 'cib-resource.xml')).to eq ""
expect(pcs_offline('resource update stonith-fence_ipmilan-stonith-fence-1 passwd=NewPassword', 'cib-resource.xml')).to eq ""
expect(pcs_offline('resource update stonith-fence_ipmilan-stonith-fence-1 password=NewPassword', 'cib-resource.xml')).to eq ""
end
it "pcs_offline update to bundle definition" do

Write Preview
Loading…
Cancel
Save