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

rbd: refactor cmdline helpers

Browse Source 
these were line by line identical except for the binary path

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler
2017-09-05 14:59:31 +02:00
committed by Wolfgang Bumiller
parent 0b9ef02ebc
commit 239aa73e93
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
PVE/Storage/RBDPlugin.pm
View File

@ -37,8 +37,8 @@ my $hostlist = sub {
} @monhostlist);
};
my $rbd_cmd = sub {
my ($scfg, $storeid, $op, @options) = @_;
my $build_cmd = sub {
my ($binary, $scfg, $storeid, $op, @options) = @_;
my $monhost = &$hostlist($scfg->{monhost}, ',');
@ -46,7 +46,7 @@ my $rbd_cmd = sub {
my $pool = $scfg->{pool} ? $scfg->{pool} : 'rbd';
my $username = $scfg->{username} ? $scfg->{username} : 'admin';
my $cmd = ['/usr/bin/rbd', '-p', $pool, '-m', $monhost];
my $cmd = [$binary, '-p', $pool, '-m', $monhost];
if (-e $keyring) {
push @$cmd, '-n', "client.$username";
@ -69,36 +69,16 @@ my $rbd_cmd = sub {
return $cmd;
};
my $rbd_cmd = sub {
my ($scfg, $storeid, $op, @options) = @_;
return $build_cmd->('/usr/bin/rbd', $scfg, $storeid, $op, @options);
};
my $rados_cmd = sub {
my ($scfg, $storeid, $op, @options) = @_;
my $monhost = &$hostlist($scfg->{monhost}, ',');
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';
}
my $cephconfig = "/etc/pve/priv/ceph/${storeid}.conf";
if (-e $cephconfig) {
push @$cmd, '-c', $cephconfig;
}
push @$cmd, $op;
push @$cmd, @options if scalar(@options);
return $cmd;
return $build_cmd->('/usr/bin/rados', $scfg, $storeid, $op, @options);
};
# needed for volumes created using ceph jewel (or higher)