convert pveceph into a PVE::CLI class

PVE/CLI/Makefile

 include ../../defines.mk
 
-SOURCES=vzdump.pm pvesubscription.pm
+SOURCES=vzdump.pm pvesubscription.pm pveceph.pm
 
 .PHONY: install
 install: ${SOURCES}

PVE/CLI/pveceph.pm

+package PVE::CLI::pveceph;
+
+use strict;
+use warnings;
+
+use Fcntl ':flock';
+use File::Path;
+use IO::File;
+use JSON;
+use Data::Dumper;
+use LWP::UserAgent;
+
+use PVE::SafeSyslog;
+use PVE::Cluster;
+use PVE::INotify;
+use PVE::RPCEnvironment;
+use PVE::Storage;
+use PVE::Tools qw(run_command);
+use PVE::JSONSchema qw(get_standard_option);
+use PVE::CephTools;
+use PVE::API2::Ceph;
+
+use PVE::CLIHandler;
+
+use base qw(PVE::CLIHandler);
+
+my $nodename = PVE::INotify::nodename();
+
+my $upid_exit = sub {
+    my $upid = shift;
+    my $status = PVE::Tools::upid_read_status($upid);
+    exit($status eq 'OK' ? 0 : -1);
+};
+
+__PACKAGE__->register_method ({
+    name => 'purge',
+    path => 'purge',
+    method => 'POST',
+    description => "Destroy ceph related data and configuration files.",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	},
+    },
+    returns => { type => 'null' },
+    code => sub {
+	my ($param) = @_;
+
+	my $monstat;
+
+	eval {
+	    my $rados = PVE::RADOS->new();
+	    my $monstat = $rados->mon_command({ prefix => 'mon_status' });
+	};
+	my $err = $@;
+
+	die "detected running ceph services- unable to purge data\n"
+	    if !$err;
+
+	# fixme: this is dangerous - should we really support this function?
+	PVE::CephTools::purge_all_ceph_files();
+
+	return undef;
+    }});
+
+__PACKAGE__->register_method ({
+    name => 'install',
+    path => 'install',
+    method => 'POST',
+    description => "Install ceph related packages.",
+    parameters => {
+	additionalProperties => 0,
+	properties => {
+	    version => {
+		type => 'string',
+		enum => ['dumpling', 'emperor', 'firefly', 'giant', 'hammer'],
+		optional => 1,
+	    }
+	},
+    },
+    returns => { type => 'null' },
+    code => sub {
+	my ($param) = @_;
+
+	my $cephver = $param->{version} || 'hammer';
+
+	local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
+
+	my $keyurl = "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc";
+
+	print "download and import ceph repository keys\n";
+
+	# Note: wget on Debian wheezy cannot handle new ceph.com certificates, so
+	# we use LWP::UserAgent
+	#system("wget -q -O- '$keyurl'| apt-key add - 2>&1 >/dev/null") == 0 ||
+	#die "unable to download ceph release key\n";
+
+	my $tmp_key_file = "/tmp/ceph-release-keys.asc";
+	my $ua = LWP::UserAgent->new(protocols_allowed => ['http', 'https'], timeout => 30);
+	$ua->env_proxy;
+	my $response = $ua->get($keyurl);
+	if ($response->is_success) {
+	    my $data = $response->decoded_content;
+	    PVE::Tools::file_set_contents($tmp_key_file, $data);
+        } else {
+	    die "unable to download ceph release key: " . $response->status_line . "\n";
+	}
+
+	system("apt-key add $tmp_key_file 2>&1 >/dev/null") == 0 ||
+	    die "unable to download ceph release key\n";
+
+	unlink $tmp_key_file;
+
+	my $source = "deb http://ceph.com/debian-$cephver wheezy main\n";
+
+	PVE::Tools::file_set_contents("/etc/apt/sources.list.d/ceph.list", $source);
+
+	print "update available package list\n";
+	eval { run_command(['apt-get', '-q', 'update'], outfunc => sub {}, errfunc => sub {}); };
+
+	run_command(['apt-get', '-q', '--assume-yes', '--no-install-recommends',
+		     '-o', 'Dpkg::Options::=--force-confnew',
+		     'install', '--',
+		     'ceph', 'ceph-common', 'gdisk']);
+
+	return undef;
+    }});
+
+our $cmddef = {
+    init => [ 'PVE::API2::Ceph', 'init', [], { node => $nodename } ],
+    lspools => [ 'PVE::API2::Ceph', 'lspools', [], { node => $nodename }, sub {
+	my $res = shift;
+
+	printf("%-20s %10s %10s %20s\n", "Name", "size", "pg_num", "used");
+	foreach my $p (sort {$a->{pool_name} cmp $b->{pool_name}} @$res) {
+	    printf("%-20s %10d %10d %20d\n", $p->{pool_name}, $p->{size}, $p->{pg_num}, $p->{bytes_used});
+	}
+    }],
+    createpool => [ 'PVE::API2::Ceph', 'createpool', ['name'], { node => $nodename }],
+    destroypool => [ 'PVE::API2::Ceph', 'destroypool', ['name'], { node => $nodename } ],
+    createosd => [ 'PVE::API2::CephOSD', 'createosd', ['dev'], { node => $nodename }, $upid_exit],
+    destroyosd => [ 'PVE::API2::CephOSD', 'destroyosd', ['osdid'], { node => $nodename }, $upid_exit],
+    createmon => [ 'PVE::API2::Ceph', 'createmon', [], { node => $nodename }, $upid_exit],
+    destroymon => [ 'PVE::API2::Ceph', 'destroymon', ['monid'], { node => $nodename }, $upid_exit],
+    start => [ 'PVE::API2::Ceph', 'start', ['service'], { node => $nodename }, $upid_exit],
+    stop => [ 'PVE::API2::Ceph', 'stop', ['service'], { node => $nodename }, $upid_exit],
+    install => [ __PACKAGE__, 'install', [] ],
+    purge => [  __PACKAGE__, 'purge', [] ],
+    status => [ 'PVE::API2::Ceph', 'status', [], { node => $nodename }, sub {
+	my $res = shift;
+	my $json = JSON->new->allow_nonref;
+	print $json->pretty->encode($res) . "\n";
+    }],
+};
+
+1;
+
+__END__
+
+=head1 NAME
+
+pveceph - tool to manage ceph services on pve nodes
+
+=head1 SYNOPSIS
+
+=include synopsis
+
+=head1 DESCRIPTION
+
+Tool to manage ceph services on pve nodes.
+
+=include pve_copyright

bin/Makefile

@@ -3,12 +3,11 @@ include ../defines.mk
 SUBDIRS = init.d ocf test
 
 SERVICES = pvestatd pveproxy pvedaemon spiceproxy
-CLITOOLS = vzdump pvesubscription
+CLITOOLS = vzdump pvesubscription pveceph
 
 SCRIPTS =  			\
 	${SERVICES}		\
 	${CLITOOLS}		\
-	pveceph			\
 	pvesh			\
 	pveam			\
 	pvebanner		\
@@ -23,7 +22,6 @@ SERVICE_PODS = $(addsuffix .pod, ${SERVICE_MANS})
 
 CLI_MANS = 				\
 	$(addsuffix .1, ${CLITOOLS})	\
-	pveceph.1			\
 	pveversion.1			\
 	pveupgrade.1			\
 	pveperf.1
@@ -73,9 +71,6 @@ pveperf.1.pod: pveperf
 pvectl.1.pod: pvectl
 	perl -I.. ./pvectl printmanpod >$@
 
-pveceph.1.pod: pveceph
-	perl -I.. -T ./pveceph printmanpod >$@
-
 vzrestore.1.pod: vzrestore
 	perl -I.. ./vzrestore printmanpod >$@
 

bin/pveceph

@@ -2,191 +2,7 @@
 
 use strict;
 use warnings;
-use Getopt::Long;
-use Fcntl ':flock';
-use File::Path;
-use IO::File;
-use JSON;
-use Data::Dumper;
-use LWP::UserAgent;
 
-use PVE::SafeSyslog;
-use PVE::Cluster;
-use PVE::INotify;
-use PVE::RPCEnvironment;
-use PVE::Storage;
-use PVE::Tools qw(run_command);
-use PVE::JSONSchema qw(get_standard_option);
-use PVE::CephTools;
-use PVE::API2::Ceph;
+use PVE::CLI::pveceph;
 
-use PVE::CLIHandler;
-
-use base qw(PVE::CLIHandler);
-
-my $nodename = PVE::INotify::nodename();
-
-sub prepare {
-    $ENV{'PATH'} = '/sbin:/bin:/usr/sbin:/usr/bin';
-
-    initlog ('pveceph');
-
-    die "please run as root\n" if $> != 0;
-
-    PVE::INotify::inotify_init();
-
-    my $rpcenv = PVE::RPCEnvironment->init('cli');
-
-    $rpcenv->init_request();
-    $rpcenv->set_language($ENV{LANG});
-    $rpcenv->set_user('root@pam');
-}
-
-my $upid_exit = sub {
-    my $upid = shift;
-    my $status = PVE::Tools::upid_read_status($upid);
-    exit($status eq 'OK' ? 0 : -1);
-};
-
-__PACKAGE__->register_method ({
-    name => 'purge',
-    path => 'purge',
-    method => 'POST',
-    description => "Destroy ceph related data and configuration files.",
-    parameters => {
-    	additionalProperties => 0,
-	properties => {
-	},
-    },
-    returns => { type => 'null' },
-    code => sub {
-	my ($param) = @_;
-
-	my $monstat;
-
-	eval { 
-	    my $rados = PVE::RADOS->new();
-	    my $monstat = $rados->mon_command({ prefix => 'mon_status' });
-	};
-	my $err = $@;
-
-	die "detected running ceph services- unable to purge data\n" 
-	    if !$err;
-
-	# fixme: this is dangerous - should we really support this function?
-	PVE::CephTools::purge_all_ceph_files();
-
-	return undef;
-    }});
-
-__PACKAGE__->register_method ({
-    name => 'install',
-    path => 'install',
-    method => 'POST',
-    description => "Install ceph related packages.",
-    parameters => {
-    	additionalProperties => 0,
-	properties => {
-	    version => {
-		type => 'string',
-		enum => ['dumpling', 'emperor', 'firefly', 'giant', 'hammer'],
-		optional => 1,
-	    }
-	},
-    },
-    returns => { type => 'null' },
-    code => sub {
-	my ($param) = @_;
-
-	my $cephver = $param->{version} || 'hammer';
-
-	local $ENV{DEBIAN_FRONTEND} = 'noninteractive';
-
-	my $keyurl = "https://git.ceph.com/?p=ceph.git;a=blob_plain;f=keys/release.asc";
-
-	print "download and import ceph repository keys\n";
-
-	# Note: wget on Debian wheezy cannot handle new ceph.com certificates, so
-	# we use LWP::UserAgent
-	#system("wget -q -O- '$keyurl'| apt-key add - 2>&1 >/dev/null") == 0 ||
-	#die "unable to download ceph release key\n";
-
-	my $tmp_key_file = "/tmp/ceph-release-keys.asc";
-	my $ua = LWP::UserAgent->new(protocols_allowed => ['http', 'https'], timeout => 30);
-	$ua->env_proxy;
-	my $response = $ua->get($keyurl);
-	if ($response->is_success) {
-	    my $data = $response->decoded_content;  
-	    PVE::Tools::file_set_contents($tmp_key_file, $data);
-        } else {
-	    die "unable to download ceph release key: " . $response->status_line . "\n";
-	}
-
-	system("apt-key add $tmp_key_file 2>&1 >/dev/null") == 0 ||
-	    die "unable to download ceph release key\n";
-
-	unlink $tmp_key_file;
-
-	my $source = "deb http://ceph.com/debian-$cephver wheezy main\n";
-
-	PVE::Tools::file_set_contents("/etc/apt/sources.list.d/ceph.list", $source);
-
-	print "update available package list\n";
-	eval { run_command(['apt-get', '-q', 'update'], outfunc => sub {}, errfunc => sub {}); };
-
-	run_command(['apt-get', '-q', '--assume-yes', '--no-install-recommends',
-		     '-o', 'Dpkg::Options::=--force-confnew',
-		     'install', '--',
-		     'ceph', 'ceph-common', 'gdisk']);
-
-	return undef;
-    }});
-
-my $cmddef = {
-    init => [ 'PVE::API2::Ceph', 'init', [], { node => $nodename } ],
-    lspools => [ 'PVE::API2::Ceph', 'lspools', [], { node => $nodename }, sub {
-	my $res = shift;
-
-	printf("%-20s %10s %10s %20s\n", "Name", "size", "pg_num", "used");
-	foreach my $p (sort {$a->{pool_name} cmp $b->{pool_name}} @$res) {
-	    printf("%-20s %10d %10d %20d\n", $p->{pool_name}, $p->{size}, $p->{pg_num}, $p->{bytes_used});
-	}
-    }],
-    createpool => [ 'PVE::API2::Ceph', 'createpool', ['name'], { node => $nodename }],
-    destroypool => [ 'PVE::API2::Ceph', 'destroypool', ['name'], { node => $nodename } ],
-    createosd => [ 'PVE::API2::CephOSD', 'createosd', ['dev'], { node => $nodename }, $upid_exit],
-    destroyosd => [ 'PVE::API2::CephOSD', 'destroyosd', ['osdid'], { node => $nodename }, $upid_exit],
-    createmon => [ 'PVE::API2::Ceph', 'createmon', [], { node => $nodename }, $upid_exit],
-    destroymon => [ 'PVE::API2::Ceph', 'destroymon', ['monid'], { node => $nodename }, $upid_exit],
-    start => [ 'PVE::API2::Ceph', 'start', ['service'], { node => $nodename }, $upid_exit],
-    stop => [ 'PVE::API2::Ceph', 'stop', ['service'], { node => $nodename }, $upid_exit],
-    install => [ __PACKAGE__, 'install', [] ],
-    purge => [  __PACKAGE__, 'purge', [] ],
-    status => [ 'PVE::API2::Ceph', 'status', [], { node => $nodename }, sub {
-	my $res = shift;
-	my $json = JSON->new->allow_nonref;
-	print $json->pretty->encode($res) . "\n";
-    }],
-};
-
-my $cmd = shift;
-
-PVE::CLIHandler::handle_cmd($cmddef, "pveceph", $cmd, \@ARGV, undef, $0, \&prepare);
-
-exit 0;
-
-__END__
-
-=head1 NAME
-
-pveceph - tool to manage ceph services on pve nodes
-
-=head1 SYNOPSIS
-
-=include synopsis
-
-=head1 DESCRIPTION
-
-Tool to manage ceph services on pve nodes.
-
-=include pve_copyright
+PVE::CLI::pveceph->run_cli();