From: Maran Hidskes <maran@protonmail.com>
Date: Mon, 13 Apr 2020 08:20:57 +0000 (+0200)
Subject: cephadm: warn when no valid version arguments are supplied to add-repo
X-Git-Tag: v15.2.2~59^2~15
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=813ee7854e5df3f1e22ac27dbf74469365336f8d;p=ceph.git

cephadm: warn when no valid version arguments are supplied to add-repo

Currently add-repo will add a broken repository by default, this commit gives a pretty error to instruct the user to use one of the version arguments.

Fixes #45029

Signed-off-by: Maran Hidskes <maran@protonmail.com>
(cherry picked from commit 115b3d7b7f3b4cf4149240fc14e374697a7cd6b1)
---

diff --git a/src/cephadm/cephadm b/src/cephadm/cephadm
index 0843314e8d2d..81332ba47356 100755
--- a/src/cephadm/cephadm
+++ b/src/cephadm/cephadm
@@ -3979,6 +3979,8 @@ def create_packager(stable=None, version=None, branch=None, commit=None):
 def command_add_repo():
     if args.version and args.release:
         raise Error('you can specify either --release or --version but not both')
+    if not args.version and not args.release and not args.dev and not args.dev_commit:
+        raise Error('please supply a --release, --version, --dev or --dev-commit argument')
     if args.version:
         try:
             (x, y, z) = args.version.split('.')