X-Git-Url: https://git.proxmox.com/?p=pve-storage.git;a=blobdiff_plain;f=PVE%2FCephConfig.pm;h=5c94a04a3bd0491de7c8ad98ba1f44bec0ef2f25;hp=1e95a90135ae2fced246392ff858ea3b24988add;hb=HEAD;hpb=e54c3e334760491954bc42f3585a8b5b136d4b1d

diff --git a/PVE/CephConfig.pm b/PVE/CephConfig.pm
deleted file mode 100644
index 1e95a90..0000000
--- a/PVE/CephConfig.pm
+++ /dev/null
@@ -1,287 +0,0 @@
-package PVE::CephConfig;
-
-use strict;
-use warnings;
-use Net::IP;
-use PVE::Tools qw(run_command);
-use PVE::Cluster qw(cfs_register_file);
-
-cfs_register_file('ceph.conf',
-		  \&parse_ceph_config,
-		  \&write_ceph_config);
-
-sub parse_ceph_config {
-    my ($filename, $raw) = @_;
-
-    my $cfg = {};
-    return $cfg if !defined($raw);
-
-    my @lines = split /\n/, $raw;
-
-    my $section;
-
-    foreach my $line (@lines) {
-	$line =~ s/#.*$//;
-	$line =~ s/^\s+//;
-	$line =~ s/^;.*$//;
-	$line =~ s/\s+$//;
-	next if !$line;
-
-	$section = $1 if $line =~ m/^\[(\S+)\]$/;
-	if (!$section) {
-	    warn "no section - skip: $line\n";
-	    next;
-	}
-
-	if ($line =~ m/^(.*?\S)\s*=\s*(\S.*)$/) {
-	    my ($key, $val) = ($1, $2);
-	    # ceph treats ' ', '_' and '-' in keys the same, so lets do too
-	    $key =~ s/[-\ ]/_/g;
-	    $cfg->{$section}->{$key} = $val;
-	}
-
-    }
-
-    return $cfg;
-}
-
-my $parse_ceph_file = sub {
-    my ($filename) = @_;
-
-    my $cfg = {};
-
-    return $cfg if ! -f $filename;
-
-    my $content = PVE::Tools::file_get_contents($filename);
-
-    return parse_ceph_config($filename, $content);
-};
-
-sub write_ceph_config {
-    my ($filename, $cfg) = @_;
-
-    my $out = '';
-
-    my $cond_write_sec = sub {
-	my $re = shift;
-
-	foreach my $section (sort keys %$cfg) {
-	    next if $section !~ m/^$re$/;
-	    $out .= "[$section]\n";
-	    foreach my $key (sort keys %{$cfg->{$section}}) {
-		$out .= "\t $key = $cfg->{$section}->{$key}\n";
-	    }
-	    $out .= "\n";
-	}
-    };
-
-    &$cond_write_sec('global');
-    &$cond_write_sec('client');
-
-    &$cond_write_sec('mds');
-    &$cond_write_sec('mon');
-    &$cond_write_sec('osd');
-    &$cond_write_sec('mgr');
-
-    &$cond_write_sec('mds\..*');
-    &$cond_write_sec('mon\..*');
-    &$cond_write_sec('osd\..*');
-    &$cond_write_sec('mgr\..*');
-
-    return $out;
-}
-
-my $ceph_get_key = sub {
-    my ($keyfile, $username) = @_;
-
-    my $key = $parse_ceph_file->($keyfile);
-    my $secret = $key->{"client.$username"}->{key};
-
-    return $secret;
-};
-
-my $get_host = sub {
-    my ($hostport) = @_;
-    my ($host, $port) = PVE::Tools::parse_host_and_port($hostport);
-    if (!defined($host)) {
-	return "";
-    }
-    $port = defined($port) ? ":$port" : '';
-    $host = "[$host]" if Net::IP::ip_is_ipv6($host);
-    return "${host}${port}";
-};
-
-sub get_monaddr_list {
-    my ($configfile) = shift;
-
-    if (!defined($configfile)) {
-	warn "No ceph config specified\n";
-	return;
-    }
-
-    my $config = $parse_ceph_file->($configfile);
-
-    my $monhostlist = {};
-
-    # get all ip adresses from mon_host
-    my $monhosts = [ split (/[ ,;]+/, $config->{global}->{mon_host} // "") ];
-
-    foreach my $monhost (@$monhosts) {
-	$monhost =~ s/^\[?v\d\://; # remove beginning of vector
-	$monhost =~ s|/\d+\]?||; # remove end of vector
-	my $host = $get_host->($monhost);
-	if ($host ne "") {
-	    $monhostlist->{$host} = 1;
-	}
-    }
-
-    # then get all addrs from mon. sections
-    for my $section ( keys %$config ) {
-	next if $section !~ m/^mon\./;
-
-	if (my $addr = $config->{$section}->{mon_addr}) {
-	    $monhostlist->{$addr} = 1;
-	}
-    }
-
-    return join(',', sort keys %$monhostlist);
-}
-
-sub hostlist {
-    my ($list_text, $separator) = @_;
-
-    my @monhostlist = PVE::Tools::split_list($list_text);
-    return join($separator, map { $get_host->($_) } @monhostlist);
-}
-
-my $ceph_check_keyfile = sub {
-    my ($filename, $type) = @_;
-
-    return if ! -f $filename;
-
-    my $content = PVE::Tools::file_get_contents($filename);
-    eval {
-	die if !$content;
-
-	if ($type eq 'rbd') {
-	    die if $content !~ /\s*\[\S+\]\s*key\s*=\s*\S+==\s*$/m;
-	} elsif ($type eq 'cephfs') {
-	    die if $content !~ /\S+==\s*$/;
-	}
-    };
-    die "Not a proper $type authentication file: $filename\n" if $@;
-
-    return undef;
-};
-
-sub ceph_connect_option {
-    my ($scfg, $storeid, %options) = @_;
-
-    my $cmd_option = {};
-    my $ceph_storeid_conf = "/etc/pve/priv/ceph/${storeid}.conf";
-    my $pveceph_config = '/etc/pve/ceph.conf';
-    my $keyfile = "/etc/pve/priv/ceph/${storeid}.keyring";
-    $keyfile = "/etc/pve/priv/ceph/${storeid}.secret" if ($scfg->{type} eq 'cephfs');
-    my $pveceph_managed = !defined($scfg->{monhost});
-
-    $cmd_option->{ceph_conf} = $pveceph_config if $pveceph_managed;
-
-    $ceph_check_keyfile->($keyfile, $scfg->{type});
-
-    if (-e $ceph_storeid_conf) {
-	if ($pveceph_managed) {
-	    warn "ignoring custom ceph config for storage '$storeid', 'monhost' is not set (assuming pveceph managed cluster)!\n";
-	} else {
-	    $cmd_option->{ceph_conf} = $ceph_storeid_conf;
-	}
-    }
-
-    $cmd_option->{keyring} = $keyfile if (-e $keyfile);
-    $cmd_option->{auth_supported} = (defined $cmd_option->{keyring}) ? 'cephx' : 'none';
-    $cmd_option->{userid} =  $scfg->{username} ? $scfg->{username} : 'admin';
-    $cmd_option->{mon_host} = hostlist($scfg->{monhost}, ',') if (defined($scfg->{monhost}));
-
-    if (%options) {
-	foreach my $k (keys %options) {
-	    $cmd_option->{$k} = $options{$k};
-	}
-    }
-
-    return $cmd_option;
-
-}
-
-sub ceph_create_keyfile {
-    my ($type, $storeid) = @_;
-
-    my $extension = 'keyring';
-    $extension = 'secret' if ($type eq 'cephfs');
-
-    my $ceph_admin_keyring = '/etc/pve/priv/ceph.client.admin.keyring';
-    my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.$extension";
-
-    die "ceph authx keyring file for storage '$storeid' already exists!\n"
-	if -e $ceph_storage_keyring;
-
-    if (-e $ceph_admin_keyring) {
-	eval {
-	    if ($type eq 'rbd') {
-		mkdir '/etc/pve/priv/ceph';
-		PVE::Tools::file_copy($ceph_admin_keyring, $ceph_storage_keyring);
-	    } elsif ($type eq 'cephfs') {
-		my $secret = $ceph_get_key->($ceph_admin_keyring, 'admin');
-		mkdir '/etc/pve/priv/ceph';
-		PVE::Tools::file_set_contents($ceph_storage_keyring, $secret, 0400);
-	   }
-	};
-	if (my $err = $@) {
-	   unlink $ceph_storage_keyring;
-	   die "failed to copy ceph authx $extension for storage '$storeid': $err\n";
-	}
-    } else {
-	warn "$ceph_admin_keyring not found, authentication is disabled.\n";
-    }
-}
-
-sub ceph_remove_keyfile {
-    my ($type, $storeid) = @_;
-
-    my $extension = 'keyring';
-    $extension = 'secret' if ($type eq 'cephfs');
-    my $ceph_storage_keyring = "/etc/pve/priv/ceph/${storeid}.$extension";
-
-    if (-f $ceph_storage_keyring) {
-	unlink($ceph_storage_keyring) or warn "removing keyring of storage failed: $!\n";
-    }
-}
-
-my $ceph_version_parser = sub {
-    my $ceph_version = shift;
-    # FIXME this is the same as pve-manager PVE::Ceph::Tools get_local_version
-    if ($ceph_version =~ /^ceph.*\s(\d+(?:\.\d+)+(?:-pve\d+)?)\s+(?:\(([a-zA-Z0-9]+)\))?/) {
-	my ($version, $buildcommit) = ($1, $2);
-	my $subversions = [ split(/\.|-/, $version) ];
-
-	return ($subversions, $version, $buildcommit);
-    }
-    warn "Could not parse Ceph version: '$ceph_version'\n";
-};
-
-sub ceph_version {
-    my ($cache) = @_;
-
-    my $version_string = $cache;
-    if (!defined($version_string)) {
-	run_command('ceph --version', outfunc => sub {
-	    $version_string = shift;
-	});
-    }
-    return undef if !defined($version_string);
-    # subversion is an array ref. with the version parts from major to minor
-    # version is the filtered version string
-    my ($subversions, $version) = $ceph_version_parser->($version_string);
-
-    return wantarray ? ($subversions, $version) : $version;
-}
-
-1;