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

rbd : rework pool - username - auth_supported options

Browse Source 
pool is now optional, default value is 'rbd';
username is now optional, default value is 'admin';

auth_supported option is removed and is autodetected.
  auth = cephx if private key exist
  auth = none if private key does not exist

Signed-off-by: Alexandre Derumier <aderumier@odiso.com>
This commit is contained in:
Alexandre Derumier
2013-02-16 17:24:22 +01:00
committed by Dietmar Maurer
parent 5649ccfe89
commit 1440604a4b
1 changed files with 49 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

66
PVE/Storage/RBDPlugin.pm
View File

@ -23,10 +23,21 @@ my $rbd_cmd = sub {
my $monhost = $scfg->{monhost}; my $monhost = $scfg->{monhost};
$monhost =~ s/;/,/g; $monhost =~ s/;/,/g;
my $cmd = ['/usr/bin/rbd', '-p', $scfg->{pool}, '-m', $monhost, '-n', my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
"client.$scfg->{username}", my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
'--keyring', "/etc/pve/priv/ceph/${storeid}.keyring", my $username = $scfg->{username} ? $scfg->{username} : 'admin';
'--auth_supported', $scfg->{authsupported}, $op];
my $cmd = ['/usr/bin/rbd', '-p', $pool, '-m', $monhost];
if(-e $keyring){
push @$cmd, '-n', "client.$username";
push @$cmd, '--keyring', $keyring;
push @$cmd, '--auth_supported', 'cephx';
}else{
push @$cmd, '--auth_supported', 'none';
}
push @$cmd, $op;
push @$cmd, @options if scalar(@options); push @$cmd, @options if scalar(@options);
@ -39,10 +50,21 @@ my $rados_cmd = sub {
my $monhost = $scfg->{monhost}; my $monhost = $scfg->{monhost};
$monhost =~ s/;/,/g; $monhost =~ s/;/,/g;
my $cmd = ['/usr/bin/rados', '-p', $scfg->{pool}, '-m', $monhost, '-n', my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
"client.$scfg->{username}", my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
'--keyring', "/etc/pve/priv/ceph/${storeid}.keyring", my $username = $scfg->{username} ? $scfg->{username} : 'admin';
'--auth_supported', $scfg->{authsupported}, $op];
my $cmd = ['/usr/bin/rados', '-p', $pool, '-m', $monhost];
if(-e $keyring){
push @$cmd, '-n', "client.$username";
push @$cmd, '--keyring', $keyring;
push @$cmd, '--auth_supported', 'cephx';
}else{
push @$cmd, '--auth_supported', 'none';
}
push @$cmd, $op;
push @$cmd, @options if scalar(@options); push @$cmd, @options if scalar(@options);
@ -53,6 +75,7 @@ sub rbd_ls {
my ($scfg, $storeid) = @_; my ($scfg, $storeid) = @_;
my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l'); my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l');
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $list = {}; my $list = {};
@ -62,7 +85,7 @@ sub rbd_ls {
if ($line =~ m/^((vm|base)-(\d+)-disk-\d+)\s+(\d+)(M|G|T)\s((\S+)\/((vm|base)-\d+-\S+@\S+))?/) { if ($line =~ m/^((vm|base)-(\d+)-disk-\d+)\s+(\d+)(M|G|T)\s((\S+)\/((vm|base)-\d+-\S+@\S+))?/) {
my ($image, $owner, $size, $unit, $parent) = ($1, $3, $4, $5, $8); my ($image, $owner, $size, $unit, $parent) = ($1, $3, $4, $5, $8);
$list->{$scfg->{pool}}->{$image} = { $list->{$pool}->{$image} = {
name => $image, name => $image,
size => $size*rbd_unittobytes()->{$unit}, size => $size*rbd_unittobytes()->{$unit},
parent => $parent, parent => $parent,
@ -174,9 +197,8 @@ sub options {
nodes => { optional => 1 }, nodes => { optional => 1 },
disable => { optional => 1 }, disable => { optional => 1 },
monhost => { fixed => 1 }, monhost => { fixed => 1 },
pool => { fixed => 1 }, pool => { optional => 1 },
username => { fixed => 1 }, username => { optional => 1 },
authsupported => { fixed => 1 },
content => { optional => 1 }, content => { optional => 1 },
}; };
} }
@ -199,11 +221,17 @@ sub path {
my ($vtype, $name, $vmid) = $class->parse_volname($volname); my ($vtype, $name, $vmid) = $class->parse_volname($volname);
my $monhost = addslashes($scfg->{monhost}); my $monhost = addslashes($scfg->{monhost});
my $pool = $scfg->{pool}; my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $username = $scfg->{username}; my $username = $scfg->{username} ? $scfg->{username} : 'admin';
my $authsupported = addslashes($scfg->{authsupported});
my $path = "rbd:$pool/$name:id=$username:auth_supported=$authsupported:keyring=/etc/pve/priv/ceph/$storeid.keyring:mon_host=$monhost"; my $path = "rbd:$pool/$name:mon_host=$monhost";
my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
if(-e $keyring ){
$path .= ":id=$username:auth_supported=cephx:keyring=$keyring";
}else{
$path .= ":auth_supported=none";
}
return ($path, $vmid, $vtype); return ($path, $vmid, $vtype);
} }
@ -212,8 +240,9 @@ my $find_free_diskname = sub {
my ($storeid, $scfg, $vmid) = @_; my ($storeid, $scfg, $vmid) = @_;
my $rbd = rbd_ls($scfg, $storeid); my $rbd = rbd_ls($scfg, $storeid);
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $disk_ids = {}; my $disk_ids = {};
my $dat = $rbd->{$scfg->{pool}}; my $dat = $rbd->{$pool};
foreach my $image (keys %$dat) { foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name}; my $volname = $dat->{$image}->{name};
@ -337,10 +366,11 @@ sub list_images {
my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_; my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
$cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd}; $cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $res = []; my $res = [];
if (my $dat = $cache->{rbd}->{$scfg->{pool}}) { if (my $dat = $cache->{rbd}->{$pool}) {
foreach my $image (keys %$dat) { foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name}; my $volname = $dat->{$image}->{name};