use PVE::DataCenterConfig

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

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

diff --git a/PVE/API2.pm b/PVE/API2.pm
index a4340d7ad307d006777c5064940a966f074b394d..2eee76365502438d31dc8b2b868e9a9666b282f1 100644 (file)
--- 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 13471cd81271d9dfd04e683e89c72ce079d83cbe..8f9534f5e5d016d338b721c0bc9080658de7de96 100644 (file)
--- 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 382a2c12a605678e939d40c1b81423c6b2b30416..3b62953f5c1d91e31025b6e276371c2166402fbf 100644 (file)
--- 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 9e731e05b7d854edc8500a51231d9b6a358ca0e9..715c8563a8196e2d4f0cb2c4c5c577017712557b 100644 (file)
--- 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 959c2c1b6e06fc2e78a33cb76df5e1a36b93e102..6657c00d6e5cc2b4bdabbeda8c21cda0f731966d 100644 (file)
--- 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 2d1dd29268425176c25347df4e100da0da866135..4218c406aa3b831ba206f0e6e996729d074882f0 100644 (file)
--- 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 a8f262a217332ae88473d3e3f1a0322e03abb9ed..a506aa9b4ed12724b13c9e3e27edf33ebeac0150 100644 (file)
--- 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 dd123dd876f8c4e86af716e6acb65720adfe7806..cbab6abe0f90a0ccac78e54deaa03b8c8c339635 100755 (executable)
--- 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 a829a52e01d2f36d1eded6023b9b2ab6bcf4cdb6..22003a65fbf2bc320928ec5032855f522e539cd4 100644 (file)
--- 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 2f807e49d155a167f772b361c9f79fc2ed14a64d..18a57497b86bac21b1f516b3969b4f295ad36ca8 100755 (executable)
--- 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 5a42ce73479055bc4e4925d9f47f99e86d914cac..d131673ec6397d9291e603d336484f65ac34ac84 100755 (executable)
--- 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;