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 4A73BBA6E for ; Mon, 3 Jul 2023 11:40:10 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 20DEF1B459 for ; Mon, 3 Jul 2023 11:39:40 +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 for ; Mon, 3 Jul 2023 11:39:39 +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 5FFBC438F3 for ; Mon, 3 Jul 2023 11:39:39 +0200 (CEST) Message-ID: <015c86d0-c4c2-ae83-3e11-bb3e88ea104e@proxmox.com> Date: Mon, 3 Jul 2023 11:39:38 +0200 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:102.0) Gecko/20100101 Thunderbird/102.12.0 Content-Language: en-US To: pve-devel@lists.proxmox.com References: <20230222142304.93093-1-m.carrara@proxmox.com> From: Max Carrara In-Reply-To: <20230222142304.93093-1-m.carrara@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.033 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.09 Looks like a legit reply (A) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record T_SCC_BODY_TEXT_LINE -0.01 - Subject: Re: [pve-devel] [PATCH manager] fix #4364: pveceph: add confirmation dialogue for ceph installation 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: Mon, 03 Jul 2023 09:40:10 -0000 On 2/22/23 15:23, Max Carrara wrote: > Displays a confirmation dialogue if the user didn't explicitly > provide a valid ceph version via the `--version` flag and if > stdout is connected to a tty. > > Signed-off-by: Max Carrara > --- > PVE/CLI/pveceph.pm | 13 +++++++++++++ > 1 file changed, 13 insertions(+) > > Note: This was tested in a VM, with and without --version flag. > > diff --git a/PVE/CLI/pveceph.pm b/PVE/CLI/pveceph.pm > index afcc67e0..eaf7918e 100755 > --- a/PVE/CLI/pveceph.pm > +++ b/PVE/CLI/pveceph.pm > @@ -157,6 +157,19 @@ __PACKAGE__->register_method ({ > } else { > die "unsupported ceph version: $cephver"; > } > + > + if (-t STDOUT && !$param->{version}) { > + my $title_case_cephver = $cephver =~ s/(.)(.*?)/\U$1\L$2/r ; > + > + print "This will install Ceph $title_case_cephver.\n" . > + "Are you sure you want to proceed (yes/no)? "; > + > + my $answer = ; > + my $valid = ($answer =~ m/^\s*yes\s*$/i) ? 1 : 0; > + > + die "Aborting installation.\n" if !$valid; > + } > + > PVE::Tools::file_set_contents("/etc/apt/sources.list.d/ceph.list", $repolist); > > my $supported_re = join('|', $supported_ceph_versions->@*); Ping - just applied this on master[0] and tested it. Though, I'm not sure if this still necessary, as we only support Quincy atm; but might become relevant once Reef is released, I suppose. [0] as of commit 50bcf799d8435b794fe2a79a74aa6df6a1419292