use warnings;
use PVE::SafeSyslog;
+use PVE::Tools qw(extract_param);
use PVE::Cluster qw(cfs_read_file cfs_write_file);
use PVE::Storage;
+use PVE::Storage::Plugin;
+use PVE::Storage::LVMPlugin;
+use PVE::Storage::CIFSPlugin;
use HTTP::Status qw(:constants);
use Storable qw(dclone);
use PVE::JSONSchema qw(get_standard_option);
my @ctypes = qw(images vztmpl iso backup);
-my $storage_type_enum = ['dir', 'nfs', 'lvm', 'iscsi'];
+my $storage_type_enum = PVE::Storage::Plugin->lookup_types();
my $api_storage_config = sub {
my ($cfg, $storeid) = @_;
- my $scfg = dclone(PVE::Storage::storage_config ($cfg, $storeid));
+ my $scfg = dclone(PVE::Storage::storage_config($cfg, $storeid));
$scfg->{storage} = $storeid;
- delete $scfg->{priority};
$scfg->{digest} = $cfg->{digest};
- $scfg->{content} = PVE::Storage::content_hash_to_string($scfg->{content});
+ $scfg->{content} = PVE::Storage::Plugin->encode_value($scfg->{type}, 'content', $scfg->{content});
if ($scfg->{nodes}) {
- $scfg->{nodes} = join(',', keys(%{$scfg->{nodes}}));
+ $scfg->{nodes} = PVE::Storage::Plugin->encode_value($scfg->{type}, 'nodes', $scfg->{nodes});
}
return $scfg;
enum => $storage_type_enum,
optional => 1,
},
-
},
},
returns => {
my $rpcenv = PVE::RPCEnvironment::get();
my $authuser = $rpcenv->get_user();
- my $cfg = cfs_read_file("storage.cfg");
+ my $cfg = PVE::Storage::config();
my @sids = PVE::Storage::storage_ids($cfg);
storage => get_standard_option('pve-storage-id'),
},
},
- returns => {},
+ returns => { type => 'object' },
code => sub {
my ($param) = @_;
- my $cfg = cfs_read_file("storage.cfg");
+ my $cfg = PVE::Storage::config();
return &$api_storage_config($cfg, $param->{storage});
}});
permissions => {
check => ['perm', '/storage', ['Datastore.Allocate']],
},
- parameters => {
- additionalProperties => 0,
- properties => {
- storage => get_standard_option('pve-storage-id'),
- nodes => get_standard_option('pve-node-list', { optional => 1 }),
- type => {
- type => 'string',
- enum => $storage_type_enum,
- },
- path => {
- type => 'string', format => 'pve-storage-path',
- optional => 1,
- },
- export => {
- type => 'string', format => 'pve-storage-path',
- optional => 1,
- },
- server => {
- type => 'string', format => 'pve-storage-server',
- optional => 1,
- },
- options => {
- type => 'string', format => 'pve-storage-options',
- optional => 1,
- },
- target => {
- type => 'string',
- optional => 1,
- },
- vgname => {
- type => 'string', format => 'pve-storage-vgname',
- optional => 1,
- },
- base => {
- type => 'string', format => 'pve-volume-id',
- optional => 1,
- },
- portal => {
- type => 'string', format => 'pve-storage-portal-dns',
- optional => 1,
- },
- content => {
- type => 'string', format => 'pve-storage-content-list',
- optional => 1,
- },
- disable => {
- type => 'boolean',
- optional => 1,
- },
- shared => {
- type => 'boolean',
- optional => 1,
- },
- 'format' => {
- type => 'string', format => 'pve-storage-format',
- optional => 1,
- },
- },
- },
+ parameters => PVE::Storage::Plugin->createSchema(),
returns => { type => 'null' },
code => sub {
my ($param) = @_;
- my $type = $param->{type};
- delete $param->{type};
+ my $type = extract_param($param, 'type');
+ 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 $storeid = $param->{storage};
- delete $param->{storage};
+ my $password = extract_param($param, 'password')
+ if $type eq 'cifs' && $param->{username};
if ($param->{portal}) {
$param->{portal} = PVE::Storage::resolv_portal($param->{portal});
}
- my $opts = PVE::Storage::parse_options($storeid, $type, $param, 1);
+ my $plugin = PVE::Storage::Plugin->lookup($type);
+ my $opts = $plugin->check_config($storeid, $param, 1, 1);
PVE::Storage::lock_storage_config(
sub {
- my $cfg = cfs_read_file('storage.cfg');
+ my $cfg = PVE::Storage::config();
- if (my $scfg = PVE::Storage::storage_config ($cfg, $storeid, 1)) {
+ if (my $scfg = PVE::Storage::storage_config($cfg, $storeid, 1)) {
die "storage ID '$storeid' already defined\n";
}
$cfg->{ids}->{$storeid} = $opts;
+ my $cred_file = undef;
+
if ($type eq 'lvm' && $opts->{base}) {
- my ($baseid, $volname) = PVE::Storage::parse_volume_id ($opts->{base});
+ my ($baseid, $volname) = PVE::Storage::parse_volume_id($opts->{base});
my $basecfg = PVE::Storage::storage_config ($cfg, $baseid, 1);
die "base storage ID '$baseid' does not exist\n" if !$basecfg;
die "unsupported base type '$basecfg->{type}'";
}
- my $path = PVE::Storage::path ($cfg, $opts->{base});
+ my $path = PVE::Storage::path($cfg, $opts->{base});
PVE::Storage::activate_storage($cfg, $baseid);
- PVE::Storage::lvm_create_volume_group ($path, $opts->{vgname}, $opts->{shared});
+ PVE::Storage::LVMPlugin::lvm_create_volume_group($path, $opts->{vgname}, $opts->{shared});
+ } elsif ($type eq 'rbd' && !defined($opts->{monhost})) {
+ my $ceph_admin_keyring = '/etc/pve/priv/ceph.client.admin.keyring';
+ my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+
+ die "ceph authx keyring file for storage '$storeid' already exists!\n"
+ if -e $ceph_storage_keyring;
+
+ eval {
+ mkdir '/etc/pve/priv/ceph';
+ PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
+ };
+ if (my $err = $@) {
+ unlink $ceph_storage_keyring;
+ die "failed to copy ceph authx keyring for storage '$storeid': $err\n";
+ }
+ } elsif ($type eq 'cifs' && defined($password)) {
+ # create a password file in /etc/pve/priv,
+ # this file is used as a cert_file at mount time.
+ $cred_file = PVE::Storage::CIFSPlugin::cifs_set_credentials($password, $storeid);
}
- # try to activate if enabled on local node,
- # we only do this to detect errors/problems sooner
- if (PVE::Storage::storage_check_enabled($cfg, $storeid, undef, 1)) {
- PVE::Storage::activate_storage($cfg, $storeid);
+ eval {
+ # try to activate if enabled on local node,
+ # we only do this to detect errors/problems sooner
+ 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;
}
- cfs_write_file('storage.cfg', $cfg);
+ PVE::Storage::write_config($cfg);
}, "create storage failed");
+ return undef;
}});
__PACKAGE__->register_method ({
permissions => {
check => ['perm', '/storage', ['Datastore.Allocate']],
},
- parameters => {
- additionalProperties => 0,
- properties => {
- storage => get_standard_option('pve-storage-id'),
- nodes => get_standard_option('pve-node-list', { optional => 1 }),
- content => {
- type => 'string', format => 'pve-storage-content-list',
- optional => 1,
- },
- 'format' => {
- type => 'string', format => 'pve-storage-format',
- optional => 1,
- },
- disable => {
- type => 'boolean',
- optional => 1,
- },
- shared => {
- type => 'boolean',
- optional => 1,
- },
- options => {
- type => 'string', format => 'pve-storage-options',
- optional => 1,
- },
- digest => {
- type => 'string',
- description => 'Prevent changes if current configuration file has different SHA1 digest. This can be used to prevent concurrent modifications.',
- maxLength => 40,
- optional => 1,
- }
- },
- },
+ parameters => PVE::Storage::Plugin->updateSchema(),
returns => { type => 'null' },
code => sub {
my ($param) = @_;
- my $storeid = $param->{storage};
- delete($param->{storage});
-
- my $digest = $param->{digest};
- delete($param->{digest});
+ my $storeid = extract_param($param, 'storage');
+ my $digest = extract_param($param, 'digest');
PVE::Storage::lock_storage_config(
sub {
- my $cfg = cfs_read_file('storage.cfg');
+ my $cfg = PVE::Storage::config();
- PVE::Storage::assert_if_modified ($cfg, $digest);
+ PVE::SectionConfig::assert_if_modified($cfg, $digest);
- my $scfg = PVE::Storage::storage_config ($cfg, $storeid);
+ my $scfg = PVE::Storage::storage_config($cfg, $storeid);
- my $opts = PVE::Storage::parse_options($storeid, $scfg->{type}, $param);
+ my $plugin = PVE::Storage::Plugin->lookup($scfg->{type});
+ my $opts = $plugin->check_config($storeid, $param, 0, 1);
foreach my $k (%$opts) {
$scfg->{$k} = $opts->{$k};
}
- cfs_write_file('storage.cfg', $cfg);
+ PVE::Storage::write_config($cfg);
}, "update storage failed");
parameters => {
additionalProperties => 0,
properties => {
- storage => get_standard_option('pve-storage-id'),
+ storage => get_standard_option('pve-storage-id', {
+ completion => \&PVE::Storage::complete_storage,
+ }),
},
},
returns => { type => 'null' },
code => sub {
my ($param) = @_;
- my $storeid = $param->{storage};
- delete($param->{storage});
-
+ my $storeid = extract_param($param, 'storage');
+
PVE::Storage::lock_storage_config(
sub {
- my $cfg = cfs_read_file('storage.cfg');
+ my $cfg = PVE::Storage::config();
+
+ my $scfg = PVE::Storage::storage_config($cfg, $storeid);
die "can't remove storage - storage is used as base of another storage\n"
- if PVE::Storage::storage_is_used ($cfg, $storeid);
+ if PVE::Storage::storage_is_used($cfg, $storeid);
- delete ($cfg->{ids}->{$storeid});
+ if ($scfg->{type} eq 'cifs') {
+ my $cred_file = PVE::Storage::CIFSPlugin::cifs_cred_file_name($storeid);
+ if (-f $cred_file) {
+ unlink($cred_file) or warn "removing cifs credientials '$cred_file' failed: $!\n";
+ }
+ } elsif ($scfg->{type} eq 'rbd' && !defined($scfg->{monhost})) {
+ my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+ if (-f $ceph_storage_keyring) {
+ unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";
+ }
+ }
- cfs_write_file('storage.cfg', $cfg);
+ delete $cfg->{ids}->{$storeid};
+
+ PVE::Storage::write_config($cfg);
}, "delete storage failed");
-
+
+ PVE::AccessControl::remove_storage_access($storeid);
+
return undef;
}});