openstack
/
puppet-pacemaker
Code Issues Proposed changes

Support fence_kubevirt apiversion parameter 

Add apiversion parameter support added in fence_kubevirt via:
https://github.com/ClusterLabs/fence-agents/pull/433

Change-Id: I837474c42592683dc4fffbe787e00fa2e15efb91
This commit is contained in:
Martin Schuppert 2021-09-03 13:37:09 +02:00
parent 744f3b78aa
commit bc4cc7899c
2 changed files with 14 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
agent_generator/src_xml/fence_kubevirt.xml
View File

@ -33,6 +33,11 @@
<content type="string" />
<shortdesc lang="en">Kubeconfig file path</shortdesc>
</parameter>
<parameter name="apiversion" unique="0" required="0">
<getopt mixed="--apiversion=[apiversion]" />
<content type="string" default="kubevirt.io/v1" />
<shortdesc lang="en">Version of the KubeVirt API.</shortdesc>
</parameter>
<parameter name="quiet" unique="0" required="0">
<getopt mixed="-q, --quiet" />
<content type="boolean" />

10
manifests/stonith/fence_kubevirt.pp
View File

@ -25,6 +25,9 @@
# [*kubeconfig*]
# Kubeconfig file path
#
# [*apiversion*]
# Version of the KubeVirt API.
#
# [*quiet*]
# Disable logging to stderr. Does not affect --verbose or --debug-file or logging to syslog.
#
@ -128,6 +131,7 @@ define pacemaker::stonith::fence_kubevirt (
$ssl_insecure = undef,
$namespace = undef,
$kubeconfig = undef,
$apiversion = undef,
$quiet = undef,
$verbose = undef,
$verbose_level = undef,
@ -178,6 +182,10 @@ define pacemaker::stonith::fence_kubevirt (
undef => '',
default => "kubeconfig=\"${kubeconfig}\"",
}
$apiversion_chunk = $apiversion ? {
undef => '',
default => "apiversion=\"${apiversion}\"",
}
$quiet_chunk = $quiet ? {
undef => '',
default => "quiet=\"${quiet}\"",
@ -250,7 +258,7 @@ define pacemaker::stonith::fence_kubevirt (
Exec<| title == 'wait-for-settle' |> -> Pcmk_stonith<||>
$param_string = "${action_chunk} ${plug_chunk} ${port_chunk} ${ssl_insecure_chunk} ${namespace_chunk} ${kubeconfig_chunk} ${quiet_chunk} ${verbose_chunk} ${verbose_level_chunk} ${debug_chunk} ${debug_file_chunk} ${separator_chunk} ${delay_chunk} ${disable_timeout_chunk} ${login_timeout_chunk} ${power_timeout_chunk} ${power_wait_chunk} ${shell_timeout_chunk} ${stonith_status_sleep_chunk} ${retry_on_chunk} op monitor interval=${interval} ${meta_attr_value_chunk}"
$param_string = "${action_chunk} ${plug_chunk} ${port_chunk} ${ssl_insecure_chunk} ${namespace_chunk} ${kubeconfig_chunk} ${apiversion_chunk} ${quiet_chunk} ${verbose_chunk} ${verbose_level_chunk} ${debug_chunk} ${debug_file_chunk} ${separator_chunk} ${delay_chunk} ${disable_timeout_chunk} ${login_timeout_chunk} ${power_timeout_chunk} ${power_wait_chunk} ${shell_timeout_chunk} ${stonith_status_sleep_chunk} ${retry_on_chunk} op monitor interval=${interval} ${meta_attr_value_chunk}"
pcmk_stonith { "stonith-fence_kubevirt-${safe_title}":