From 596855405f234d30daa8065802dfa30edf600f8b Mon Sep 17 00:00:00 2001 From: Digimer Date: Mon, 17 Oct 2022 21:57:00 -0400 Subject: [PATCH] * Added variables to record when pacemaker and DRBD are configured. * Added verify-alg to DRBD configs. Signed-off-by: Digimer --- share/words.xml | 7 ++++++- tools/anvil-join-anvil | 22 ++++++++++++++++++++++ 2 files changed, 28 insertions(+), 1 deletion(-) diff --git a/share/words.xml b/share/words.xml index 8e9b2cc9..92e8c405 100644 --- a/share/words.xml +++ b/share/words.xml @@ -568,7 +568,8 @@ resource #!variable!server!# { c-max-rate 500M; } net { - protocol C; + protocol C; + verify-alg md5; fencing resource-and-stonith; } } @@ -801,6 +802,7 @@ sys::manage::firewall = 1 } net { protocol #!variable!protocol!#; + verify-alg md5; fencing #!variable!fencing!#; } } @@ -829,6 +831,7 @@ resource #!variable!server!# { } net { protocol #!variable!protocol!#; + verify-alg md5; fencing #!variable!fencing!#; } } @@ -2998,6 +3001,8 @@ If you are comfortable that the target has changed for a known reason, you can s Stay Off This is the command used to provision the referenced server. This indicates if a Striker's DB is available to be used. + This indicates that this node has had pacemaker configured. + This indicates that this node or DR host has had base DRBD configured. #!variable!number!#/sec diff --git a/tools/anvil-join-anvil b/tools/anvil-join-anvil index 6e75fff4..08836aba 100755 --- a/tools/anvil-join-anvil +++ b/tools/anvil-join-anvil @@ -97,6 +97,17 @@ sub configure_drbd $anvil->Log->entry({source => $THIS_FILE, line => __LINE__, 'print' => 1, level => 1, key => "job_0128"}); } + # Record that we're done configuring pacemaker. + $anvil->Database->insert_or_update_variables({ + variable_name => "system::drbd::configured", + variable_value => 1, + variable_default => "", + variable_description => "striker_0296", + variable_section => "system", + variable_source_uuid => $anvil->data->{sys}{host_uuid}, + variable_source_table => "hosts", + }); + return(0); } @@ -1117,6 +1128,17 @@ sub configure_pacemaker check_corosync($anvil); } + # Record that we're done configuring pacemaker. + $anvil->Database->insert_or_update_variables({ + variable_name => "system::pacemaker::configured", + variable_value => 1, + variable_default => "", + variable_description => "striker_0295", + variable_section => "system", + variable_source_uuid => $anvil->data->{sys}{host_uuid}, + variable_source_table => "hosts", + }); + return(0); }