From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D0581752D2 for ; Fri, 4 Jun 2021 15:50:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6F8AE1E0D7 for ; Fri, 4 Jun 2021 15:50:06 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id EC35E1DDA7 for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id C427946720 for ; Fri, 4 Jun 2021 15:49:51 +0200 (CEST) From: Fabian Ebner To: pve-devel@lists.proxmox.com Date: Fri, 4 Jun 2021 15:49:44 +0200 Message-Id: <20210604134946.152720-21-f.ebner@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210604134946.152720-1-f.ebner@proxmox.com> References: <20210604134946.152720-1-f.ebner@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL -0.148 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment POISEN_SPAM_PILL 0.1 Meta: its spam POISEN_SPAM_PILL_1 0.1 random spam to be learned in bayes POISEN_SPAM_PILL_3 0.1 random spam to be learned in bayes SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [ceph.pm] Subject: [pve-devel] [PATCH manager 10/12] api: ceph: remove moved 'flags' calls X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 04 Jun 2021 13:50:37 -0000 living below /cluster/ceph now. Frontend was adapted as part of the move in commit 90bb3598b5e257d06d4a49b44a4f5de02eb587a8 Signed-off-by: Fabian Ebner --- PVE/API2/Ceph.pm | 109 ----------------------------------------------- 1 file changed, 109 deletions(-) diff --git a/PVE/API2/Ceph.pm b/PVE/API2/Ceph.pm index d6eb5563..3bbcfe4c 100644 --- a/PVE/API2/Ceph.pm +++ b/PVE/API2/Ceph.pm @@ -100,7 +100,6 @@ __PACKAGE__->register_method ({ { name => 'crush' }, { name => 'config' }, { name => 'log' }, - { name => 'flags' }, # FIXME: remove with 7.0 { name => 'rules' }, ]; @@ -493,114 +492,6 @@ __PACKAGE__->register_method ({ }}); -my $possible_flags = PVE::Ceph::Tools::get_possible_osd_flags(); -my $possible_flags_list = [ sort keys %$possible_flags ]; - -# FIXME: Remove with PVE 7.0 -__PACKAGE__->register_method ({ - name => 'get_flags', - path => 'flags', - method => 'GET', - description => "get all set ceph flags", - proxyto => 'node', - protected => 1, - permissions => { - check => ['perm', '/', [ 'Sys.Audit' ]], - }, - parameters => { - additionalProperties => 0, - properties => { - node => get_standard_option('pve-node'), - }, - }, - returns => { type => 'string' }, - code => sub { - my ($param) = @_; - - PVE::Ceph::Tools::check_ceph_configured(); - - my $rados = PVE::RADOS->new(); - - my $stat = $rados->mon_command({ prefix => 'osd dump' }); - - return $stat->{flags} // ''; - }}); - -# FIXME: Remove with PVE 7.0 -__PACKAGE__->register_method ({ - name => 'set_flag', - path => 'flags/{flag}', - method => 'POST', - description => "Set a specific ceph flag", - proxyto => 'node', - protected => 1, - permissions => { - check => ['perm', '/', [ 'Sys.Modify' ]], - }, - parameters => { - additionalProperties => 0, - properties => { - node => get_standard_option('pve-node'), - flag => { - description => 'The ceph flag to set', - type => 'string', - enum => $possible_flags_list, - }, - }, - }, - returns => { type => 'null' }, - code => sub { - my ($param) = @_; - - PVE::Ceph::Tools::check_ceph_configured(); - - my $rados = PVE::RADOS->new(); - - $rados->mon_command({ - prefix => "osd set", - key => $param->{flag}, - }); - - return undef; - }}); - -__PACKAGE__->register_method ({ - name => 'unset_flag', - path => 'flags/{flag}', - method => 'DELETE', - description => "Unset a ceph flag", - proxyto => 'node', - protected => 1, - permissions => { - check => ['perm', '/', [ 'Sys.Modify' ]], - }, - parameters => { - additionalProperties => 0, - properties => { - node => get_standard_option('pve-node'), - flag => { - description => 'The ceph flag to unset', - type => 'string', - enum => $possible_flags_list, - }, - }, - }, - returns => { type => 'null' }, - code => sub { - my ($param) = @_; - - PVE::Ceph::Tools::check_ceph_configured(); - - my $rados = PVE::RADOS->new(); - - $rados->mon_command({ - prefix => "osd unset", - key => $param->{flag}, - }); - - return undef; - }}); - __PACKAGE__->register_method ({ name => 'crush', path => 'crush', -- 2.30.2