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

Add cifs in create API call.

Browse Source 
In this patch the nodes will be deleted if the nodes parameter comes with a empty string.
We need this in the GUI when update the nodes in the config to reset if a nodes.

If we do not erase the empty hash the storage online check would be skipped.
Also the password and user would not be verified.
This commit is contained in:
Wolfgang Link
2018-03-16 10:22:52 +01:00
committed by Dietmar Maurer
parent f79a699c13
commit a4a9405d76
1 changed files with 22 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
PVE/API2/Storage/Config.pm
View File

@ -12,6 +12,7 @@ use HTTP::Status qw(:constants);
use Storable qw(dclone); use Storable qw(dclone);
use PVE::JSONSchema qw(get_standard_option); use PVE::JSONSchema qw(get_standard_option);
use PVE::RPCEnvironment; use PVE::RPCEnvironment;
use PVE::PTY;
use PVE::RESTHandler; use PVE::RESTHandler;
@ -139,6 +140,13 @@ __PACKAGE__->register_method ({
my $type = extract_param($param, 'type'); my $type = extract_param($param, 'type');
my $storeid = extract_param($param, 'storage'); my $storeid = extract_param($param, 'storage');
# revent an empty nodelist.
# fix me in section config create never need an empty entity.
delete $param->{nodes} if !$param->{nodes};
my $password = extract_param($param, 'password')
if $type eq 'cifs' && $param->{username};
if ($param->{portal}) { if ($param->{portal}) {
$param->{portal} = PVE::Storage::resolv_portal($param->{portal}); $param->{portal} = PVE::Storage::resolv_portal($param->{portal});
} }
@ -190,11 +198,21 @@ __PACKAGE__->register_method ({
die "failed to copy ceph authx keyring for storage '$storeid': $err\n"; die "failed to copy ceph authx keyring for storage '$storeid': $err\n";
} }
} }
# create a password file in /etc/pve/priv,
# this file is used as a cert_file at mount time.
my $cred_file = &$set_cifs_credentials($password, $storeid)
if defined($password);
# try to activate if enabled on local node, eval {
# we only do this to detect errors/problems sooner # try to activate if enabled on local node,
if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) { # we only do this to detect errors/problems sooner
PVE::Storage::activate_storage($cfg, $storeid); if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) {
PVE::Storage::activate_storage($cfg, $storeid);
}
};
if(my $err = $@) {
unlink $cred_file if defined($cred_file);
die $err;
} }
PVE::Storage::write_config($cfg); PVE::Storage::write_config($cfg);