yesBad/pve-storage
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

move Storage/CephTools to CephConfig

Browse Source 
it is not a storage plugin, and it makes more sense to have it
top-level, but there we cannot name it CephTools because of the
existing ones in pve-manager

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2018-12-19 11:24:39 +01:00
committed by Thomas Lamprecht
parent 36d4af9ba8
commit 4050fcc16b
5 changed files with 17 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
PVE/Storage/CephFSPlugin.pm
View File

@ -11,16 +11,16 @@ use PVE::Tools qw(run_command);
use PVE::ProcFSTools;
use PVE::Storage::Plugin;
use PVE::JSONSchema qw(get_standard_option);
use PVE::Storage::CephTools;
use PVE::CephConfig;
use base qw(PVE::Storage::Plugin);
sub cephfs_is_mounted {
my ($scfg, $storeid, $mountdata) = @_;
my $cmd_option = PVE::Storage::CephTools::ceph_connect_option($scfg, $storeid);
my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
my $configfile = $cmd_option->{ceph_conf};
my $server = $cmd_option->{mon_host} // PVE::Storage::CephTools::get_monaddr_list($configfile);
my $server = $cmd_option->{mon_host} // PVE::CephConfig::get_monaddr_list($configfile);
my $subdir = $scfg->{subdir} // '/';
my $mountpoint = $scfg->{path};
@ -46,10 +46,10 @@ sub cephfs_mount {
my $mountpoint = $scfg->{path};
my $subdir = $scfg->{subdir} // '/';
my $cmd_option = PVE::Storage::CephTools::ceph_connect_option($scfg, $storeid);
my $cmd_option = PVE::CephConfig::ceph_connect_option($scfg, $storeid);
my $configfile = $cmd_option->{ceph_conf};
my $secretfile = $cmd_option->{keyring};
my $server = $cmd_option->{mon_host} // PVE::Storage::CephTools::get_monaddr_list($configfile);
my $server = $cmd_option->{mon_host} // PVE::CephConfig::get_monaddr_list($configfile);
# fuse -> client-enforced quotas (kernel doesn't), updates w/ ceph-fuse pkg
# kernel -> better performance, less frequent updates
@ -137,7 +137,7 @@ sub on_add_hook {
return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
PVE::Storage::CephTools::ceph_create_keyfile($scfg->{type}, $storeid);
PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid);
}
sub on_delete_hook {
@ -145,7 +145,7 @@ sub on_delete_hook {
return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
PVE::Storage::CephTools::ceph_remove_keyfile($scfg->{type}, $storeid);
PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid);
}
sub status {