env: rename get_ha_settings to get_datacenter_settings

The method will be extended to include other HA-relevant settings from
datacenter.cfg.

Suggested-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
Signed-off-by: Fiona Ebner <f.ebner@proxmox.com>

diff --git a/src/PVE/HA/Env.pm b/src/PVE/HA/Env.pm
index 00e3e3c18d8c42ad8cbbdf0f7b65aabf390eb5d7..16603ec78ec4ef85a39ac37640e9cd1529d58741 100644 (file)
--- a/src/PVE/HA/Env.pm
+++ b/src/PVE/HA/Env.pm
@@ -263,10 +263,10 @@ sub get_max_workers {
 }
 
 # return cluster wide enforced HA settings
-sub get_ha_settings {
+sub get_datacenter_settings {
     my ($self) = @_;
 
-    return $self->{plug}->get_ha_settings();
+    return $self->{plug}->get_datacenter_settings();
 }
 
 sub get_static_node_stats {

diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm
index 7fac43c60ca06b599314fa6242f32f235a6180b4..d2c46e8c861b50dee87c6497e484af423f4dd1c7 100644 (file)
--- a/src/PVE/HA/Env/PVE2.pm
+++ b/src/PVE/HA/Env/PVE2.pm
@@ -452,7 +452,7 @@ sub get_max_workers {
 }
 
 # return cluster wide enforced HA settings
-sub get_ha_settings {
+sub get_datacenter_settings {
     my ($self) = @_;
 
     my $datacenterconfig = eval { cfs_read_file('datacenter.cfg') };

diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
index 8cbdb8266aa7fbeafe9e3efe15b0039024514664..7750f4d45cff5cb90827d9e6335ff19f8aa37263 100644 (file)
--- a/src/PVE/HA/LRM.pm
+++ b/src/PVE/HA/LRM.pm
@@ -59,7 +59,7 @@ sub shutdown_request {
 
     my ($shutdown, $reboot) = $haenv->is_node_shutdown();
 
-    my $dc_ha_cfg = $haenv->get_ha_settings();
+    my $dc_ha_cfg = $haenv->get_datacenter_settings();
     my $shutdown_policy = $dc_ha_cfg->{shutdown_policy} // 'conditional';
 
     if ($shutdown) { # don't log this on service restart, only on node shutdown

diff --git a/src/PVE/HA/Sim/Env.pm b/src/PVE/HA/Sim/Env.pm
index 6bd35b3be999df2a1bb137f7ba60be3a010df18d..6c4703079a7ab4ecc9e1511c8310110d4951e3bf 100644 (file)
--- a/src/PVE/HA/Sim/Env.pm
+++ b/src/PVE/HA/Sim/Env.pm
@@ -425,7 +425,7 @@ sub get_max_workers {
 }
 
 # return cluster wide enforced HA settings
-sub get_ha_settings {
+sub get_datacenter_settings {
     my ($self) = @_;
 
     my $datacenterconfig = $self->{hardware}->read_datacenter_conf();