[pve-devel] [PATCH v2 manager 02/10] use PVE::DataCenterConfig

[Fabian Grünbichler]

to make sure that the corresponding cfs_read_file works() works.

Signed-off-by: Fabian Grünbichler <f.gruenbichler at proxmox.com>
---

Notes:
    needs a dependency on libpve-cluster-perl

 PVE/API2.pm              | 1 +
 PVE/API2/APT.pm          | 1 +
 PVE/API2/Cluster.pm      | 3 ++-
 PVE/API2/Nodes.pm        | 1 +
 PVE/API2/Subscription.pm | 1 +
 PVE/API2Tools.pm         | 1 +
 PVE/CLI/pveam.pm         | 1 +
 PVE/Service/pveproxy.pm  | 1 +
 PVE/VZDump.pm            | 1 +
 bin/pvemailforward.pl    | 1 +
 bin/pveupdate            | 1 +
 11 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/PVE/API2.pm b/PVE/API2.pm
index a4340d7a..2eee7636 100644
--- a/PVE/API2.pm
+++ b/PVE/API2.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 
 use PVE::pvecfg;
+use PVE::DataCenterConfig;
 use PVE::RESTHandler;
 use PVE::JSONSchema;
 
diff --git a/PVE/API2/APT.pm b/PVE/API2/APT.pm
index 13471cd8..8f9534f5 100644
--- a/PVE/API2/APT.pm
+++ b/PVE/API2/APT.pm
@@ -13,6 +13,7 @@ use LWP::UserAgent;
 use PVE::pvecfg;
 use PVE::Tools qw(extract_param);
 use PVE::Cluster;
+use PVE::DataCenterConfig;
 use PVE::SafeSyslog;
 use PVE::INotify;
 use PVE::Exception;
diff --git a/PVE/API2/Cluster.pm b/PVE/API2/Cluster.pm
index 382a2c12..3b62953f 100644
--- a/PVE/API2/Cluster.pm
+++ b/PVE/API2/Cluster.pm
@@ -7,6 +7,7 @@ use JSON;
 
 use PVE::API2Tools;
 use PVE::Cluster qw(cfs_register_file cfs_lock_file cfs_read_file cfs_write_file);
+use PVE::DataCenterConfig;
 use PVE::Exception qw(raise_param_exc);
 use PVE::Firewall;
 use PVE::HA::Config;
@@ -77,7 +78,7 @@ if ($have_sdn) {
     });
 }
 
-my $dc_schema = PVE::Cluster::get_datacenter_schema();
+my $dc_schema = PVE::DataCenterConfig::get_datacenter_schema();
 my $dc_properties = { 
     delete => {
 	type => 'string', format => 'pve-configid-list',
diff --git a/PVE/API2/Nodes.pm b/PVE/API2/Nodes.pm
index 9e731e05..715c8563 100644
--- a/PVE/API2/Nodes.pm
+++ b/PVE/API2/Nodes.pm
@@ -47,6 +47,7 @@ use PVE::API2::Hardware;
 use Digest::MD5;
 use Digest::SHA;
 use PVE::API2::Disks;
+use PVE::DataCenterConfig;
 use JSON;
 use Socket;
 
diff --git a/PVE/API2/Subscription.pm b/PVE/API2/Subscription.pm
index 959c2c1b..6657c00d 100644
--- a/PVE/API2/Subscription.pm
+++ b/PVE/API2/Subscription.pm
@@ -13,6 +13,7 @@ use PVE::ProcFSTools;
 use PVE::Exception qw(raise_param_exc);
 use PVE::INotify;
 use PVE::Cluster qw (cfs_read_file cfs_write_file);
+use PVE::DataCenterConfig;
 use PVE::AccessControl;
 use PVE::Storage;
 use PVE::JSONSchema qw(get_standard_option);
diff --git a/PVE/API2Tools.pm b/PVE/API2Tools.pm
index 2d1dd292..4218c406 100644
--- a/PVE/API2Tools.pm
+++ b/PVE/API2Tools.pm
@@ -8,6 +8,7 @@ use PVE::Exception qw(raise_param_exc);
 use PVE::Tools;
 use PVE::INotify;
 use PVE::Cluster;
+use PVE::DataCenterConfig;
 use PVE::RPCEnvironment;
 use Digest::MD5 qw(md5_hex);
 use URI;
diff --git a/PVE/CLI/pveam.pm b/PVE/CLI/pveam.pm
index a8f262a2..a506aa9b 100644
--- a/PVE/CLI/pveam.pm
+++ b/PVE/CLI/pveam.pm
@@ -8,6 +8,7 @@ use PVE::APLInfo;
 use PVE::SafeSyslog;
 use PVE::Tools qw(extract_param);
 use PVE::Cluster;
+use PVE::DataCenterConfig;
 use PVE::INotify;
 use PVE::RPCEnvironment;
 use PVE::JSONSchema qw(get_standard_option);
diff --git a/PVE/Service/pveproxy.pm b/PVE/Service/pveproxy.pm
index dd123dd8..cbab6abe 100755
--- a/PVE/Service/pveproxy.pm
+++ b/PVE/Service/pveproxy.pm
@@ -11,6 +11,7 @@ use URI;
 use URI::QueryParam;
 use Data::Dumper;
 use PVE::Cluster;
+use PVE::DataCenterConfig;
 use PVE::APIServer::Utils;
 use PVE::API2;
 use PVE::APIServer::Formatter;
diff --git a/PVE/VZDump.pm b/PVE/VZDump.pm
index a829a52e..22003a65 100644
--- a/PVE/VZDump.pm
+++ b/PVE/VZDump.pm
@@ -11,6 +11,7 @@ use File::Path;
 use PVE::RPCEnvironment;
 use PVE::Storage;
 use PVE::Cluster qw(cfs_read_file);
+use PVE::DataCenterConfig;
 use POSIX qw(strftime);
 use Time::Local;
 use PVE::JSONSchema qw(get_standard_option);
diff --git a/bin/pvemailforward.pl b/bin/pvemailforward.pl
index 2f807e49..18a57497 100755
--- a/bin/pvemailforward.pl
+++ b/bin/pvemailforward.pl
@@ -6,6 +6,7 @@ use PVE::Tools;
 use PVE::SafeSyslog;
 use PVE::AccessControl;
 use PVE::Cluster qw (cfs_read_file);
+use PVE::DataCenterConfig;
 
 # NOTE: we need to run this with setgid www-data
 # else we cant read /etc/pve/user.cfg
diff --git a/bin/pveupdate b/bin/pveupdate
index 5a42ce73..d131673e 100755
--- a/bin/pveupdate
+++ b/bin/pveupdate
@@ -12,6 +12,7 @@ use PVE::Certificate;
 use PVE::NodeConfig;
 use PVE::INotify;
 use PVE::Cluster;
+use PVE::DataCenterConfig;
 use PVE::APLInfo;
 use PVE::SafeSyslog;
 use PVE::RPCEnvironment;
-- 
2.20.1