proxmox-mirrors/pve-manager
1
0
Fork 0
mirror of https://git.proxmox.com/git/pve-manager synced 2025-08-16 08:44:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ceph: remove 'exclude-manager' api parameter

Browse Source 
since we will have a seperate gui for the manager, we do not need this
anymore

this is a breaking api change

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak 2019-06-04 14:47:45 +02:00 committed by Thomas Lamprecht
parent 66fb085fc0
commit 919513b01b
1 changed files with 0 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
PVE/API2/Ceph/MON.pm
View File

@ -127,12 +127,6 @@ __PACKAGE__->register_method ({
pattern => '[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?', pattern => '[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?',
description => "The ID for the monitor, when omitted the same as the nodename", description => "The ID for the monitor, when omitted the same as the nodename",
}, },
'exclude-manager' => {
type => 'boolean',
optional => 1,
default => 0,
description => "When set, only a monitor will be created.",
},
'mon-address' => { 'mon-address' => {
description => 'Overwrites autodetected monitor IP address. ' . description => 'Overwrites autodetected monitor IP address. ' .
'Must be in the public network of ceph.', 'Must be in the public network of ceph.',
@ -147,9 +141,6 @@ __PACKAGE__->register_method ({
PVE::Ceph::Tools::check_ceph_installed('ceph_mon'); PVE::Ceph::Tools::check_ceph_installed('ceph_mon');
PVE::Ceph::Tools::check_ceph_installed('ceph_mgr')
if (!$param->{'exclude-manager'});
PVE::Ceph::Tools::check_ceph_inited(); PVE::Ceph::Tools::check_ceph_inited();
PVE::Ceph::Tools::setup_pve_symlinks(); PVE::Ceph::Tools::setup_pve_symlinks();
@ -262,12 +253,6 @@ __PACKAGE__->register_method ({
warn "Enable ceph-mon\@${monid}.service failed, do manually: $@\n" if $@; warn "Enable ceph-mon\@${monid}.service failed, do manually: $@\n" if $@;
waitpid($create_keys_pid, 0); waitpid($create_keys_pid, 0);
} }
# create manager
if (!$param->{'exclude-manager'}) {
my $rados = PVE::RADOS->new(timeout => PVE::Ceph::Tools::get_config('long_rados_timeout'));
PVE::Ceph::Services::create_mgr($monid, $rados);
}
PVE::Ceph::Services::broadcast_ceph_services(); PVE::Ceph::Services::broadcast_ceph_services();
}; };
@ -293,12 +278,6 @@ __PACKAGE__->register_method ({
type => 'string', type => 'string',
pattern => '[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?', pattern => '[a-zA-Z0-9]([a-zA-Z0-9\-]*[a-zA-Z0-9])?',
}, },
'exclude-manager' => {
type => 'boolean',
default => 0,
optional => 1,
description => "When set, removes only the monitor, not the manager"
}
}, },
}, },
returns => { type => 'string' }, returns => { type => 'string' },
@ -344,12 +323,6 @@ __PACKAGE__->register_method ({
delete $cfg->{$monsection}; delete $cfg->{$monsection};
cfs_write_file('ceph.conf', $cfg); cfs_write_file('ceph.conf', $cfg);
File::Path::remove_tree($mondir); File::Path::remove_tree($mondir);
# remove manager
if (!$param->{'exclude-manager'}) {
eval { PVE::Ceph::Services::destroy_mgr($monid) };
warn $@ if $@;
}
PVE::Ceph::Services::broadcast_ceph_services(); PVE::Ceph::Services::broadcast_ceph_services();
}; };