my sub get_rbd_path {
my ($scfg, $volume) = @_;
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
- my $namespace = $scfg->{namespace};
-
- return "${pool}/${namespace}/${volume}" if defined($namespace);
- return "${pool}/${volume}";
+ my $path = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ $path .= "/$scfg->{namespace}" if defined($scfg->{namespace});
+ $path .= "/$volume" if defined($volume);
+ return $path;
};
my $build_cmd = sub {
description => "Always access rbd through krbd kernel module.",
type => 'boolean',
},
+ keyring => {
+ description => "Client keyring contents (for external clusters).",
+ type => 'string',
+ },
};
}
username => { optional => 1 },
content => { optional => 1 },
krbd => { optional => 1 },
+ keyring => { optional => 1 },
bwlimit => { optional => 1 },
};
}
sub on_add_hook {
my ($class, $storeid, $scfg, %param) = @_;
- return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
+ my $secret = $param{keyring} if defined $param{keyring} // undef;
+ PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $secret);
+
+ return;
+}
+
+sub on_update_hook {
+ my ($class, $storeid, $scfg, %param) = @_;
- PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid);
+ if (exists($param{keyring})) {
+ if (defined($param{keyring})) {
+ PVE::CephConfig::ceph_create_keyfile($scfg->{type}, $storeid, $param{keyring});
+ } else {
+ PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid);
+ }
+ }
return;
}
sub on_delete_hook {
my ($class, $storeid, $scfg) = @_;
-
- return if defined($scfg->{monhost}); # nothing to do if not pve managed ceph
-
PVE::CephConfig::ceph_remove_keyfile($scfg->{type}, $storeid);
-
return;
}
$name = $class->find_free_diskname($storeid, $scfg, $vmid) if !$name;
my $cmd = $rbd_cmd->($scfg, $storeid, 'create', '--image-format' , 2, '--size', int(($size+1023)/1024), $name);
- run_rbd_command($cmd, errmsg => "rbd create $name' error");
+ run_rbd_command($cmd, errmsg => "rbd create '$name' error");
return $name;
}
$cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
- my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
- $pool .= "/$scfg->{namespace}" if defined($scfg->{namespace});
-
- my $dat = $cache->{rbd}->{$pool};
+ my $dat = $cache->{rbd}->{get_rbd_path($scfg)};
return [] if !$dat; # nothing found
my $res = [];