}
}
+my $add_pool_to_disk = sub {
+ my ($scfg, $disk) = @_;
+
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+
+ return "$pool/$disk";
+};
+
my $rbd_cmd = sub {
my ($scfg, $storeid, $op, @options) = @_;
my $monhost = $scfg->{monhost};
$monhost =~ s/;/,/g;
- my $cmd = ['/usr/bin/rbd', '-p', $scfg->{pool}, '-m', $monhost, '-n',
- "client.$scfg->{username}",
- '--keyring', "/etc/pve/priv/ceph/${storeid}.keyring",
- '--auth_supported', $scfg->{authsupported}, $op];
+ my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ my $username = $scfg->{username} ? $scfg->{username} : 'admin';
+
+ 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);
my $monhost = $scfg->{monhost};
$monhost =~ s/;/,/g;
- my $cmd = ['/usr/bin/rados', '-p', $scfg->{pool}, '-m', $monhost, '-n',
- "client.$scfg->{username}",
- '--keyring', "/etc/pve/priv/ceph/${storeid}.keyring",
- '--auth_supported', $scfg->{authsupported}, $op];
+ my $keyring = "/etc/pve/priv/ceph/${storeid}.keyring";
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ my $username = $scfg->{username} ? $scfg->{username} : 'admin';
+
+ 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);
my ($scfg, $storeid) = @_;
my $cmd = &$rbd_cmd($scfg, $storeid, 'ls', '-l');
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $list = {};
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);
- $list->{$scfg->{pool}}->{$image} = {
+ $list->{$pool}->{$image} = {
name => $image,
size => $size*rbd_unittobytes()->{$unit},
parent => $parent,
nodes => { optional => 1 },
disable => { optional => 1 },
monhost => { fixed => 1 },
- pool => { fixed => 1 },
- username => { fixed => 1 },
- authsupported => { fixed => 1 },
+ pool => { optional => 1 },
+ username => { optional => 1 },
content => { optional => 1 },
};
}
}
sub path {
- my ($class, $scfg, $volname, $storeid) = @_;
+ my ($class, $scfg, $volname, $storeid, $snapname) = @_;
my ($vtype, $name, $vmid) = $class->parse_volname($volname);
+ $name .= '@'.$snapname if $snapname;
my $monhost = addslashes($scfg->{monhost});
- my $pool = $scfg->{pool};
- my $username = $scfg->{username};
- 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 $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
+ my $username = $scfg->{username} ? $scfg->{username} : 'admin';
+
+ 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);
}
my ($storeid, $scfg, $vmid) = @_;
my $rbd = rbd_ls($scfg, $storeid);
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $disk_ids = {};
- my $dat = $rbd->{$scfg->{pool}};
+ my $dat = $rbd->{$pool};
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
my $newvolname = $basename ? "$basename/$newname" : "$newname";
- my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', $name, $newname);
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'rename', &$add_pool_to_disk($scfg, $name), &$add_pool_to_disk($scfg, $newname));
run_command($cmd, errmsg => "rbd rename $name' error", errfunc => sub {});
my $running = undef; #fixme : is create_base always offline ?
$name = &$find_free_diskname($storeid, $scfg, $vmid);
- my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', ($size/1024), $name);
+ my $cmd = &$rbd_cmd($scfg, $storeid, 'create', '--format' , 2, '--size', int(($size+1023)/1024), $name);
run_command($cmd, errmsg => "rbd create $name' error", errfunc => sub {});
return $name;
my ($class, $storeid, $scfg, $vmid, $vollist, $cache) = @_;
$cache->{rbd} = rbd_ls($scfg, $storeid) if !$cache->{rbd};
+ my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $res = [];
- if (my $dat = $cache->{rbd}->{$scfg->{pool}}) {
+ if (my $dat = $cache->{rbd}->{$pool}) {
foreach my $image (keys %$dat) {
my $volname = $dat->{$image}->{name};
my ($class, $scfg, $feature, $storeid, $volname, $snapname, $running) = @_;
my $features = {
- snapshot => { current => 1, snap => 1},
- clone => { snap => 1},
+ snapshot => { current => 1, snap => 1},
+ clone => { base => 1},
+ template => { current => 1},
+ copy => { base => 1, current => 1, snap => 1},
};
- my $snap = $snapname ? 'snap' : 'current';
- return 1 if $features->{$feature}->{$snap};
+ my ($vtype, $name, $vmid, $basename, $basevmid, $isBase) =
+ $class->parse_volname($volname);
+
+ my $key = undef;
+ if($snapname){
+ $key = 'snap';
+ }else{
+ $key = $isBase ? 'base' : 'current';
+ }
+ return 1 if $features->{$feature}->{$key};
return undef;
}