From: Alfredo Deza <alfredo.deza@inktank.com>
Date: Thu, 19 Feb 2015 20:18:52 +0000 (-0500)
Subject: add a sanitizer args function to set/fix defaults for install
X-Git-Tag: v1.5.22-rc1~2^2~6
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=a97b1cc4243e0f7c6d44eaae3ae625f39104dd2d;p=ceph-deploy.git

add a sanitizer args function to set/fix defaults for install

Signed-off-by: Alfredo Deza <alfredo.deza@inktank.com>
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 84bc865..3985952 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -10,19 +10,33 @@ from ceph_deploy.lib import remoto
 LOG = logging.getLogger(__name__)
 
 
-def install(args):
-    if args.repo:
-        return install_repo(args)
+def sanitize_args(args):
+    """
+    args may need a bunch of logic to set proper defaults that argparse is
+    not well suited for.
+    """
+    if args.release is None:
+        args.release = 'giant'
+        args.default_release = True
 
     # XXX This whole dance is because --stable is getting deprecated
     if args.stable is not None:
         LOG.warning('the --stable flag is deprecated, use --release instead')
         args.release = args.stable
+    # XXX Tango ends here.
+
+    return args
+
+
+def install(args):
+    args = sanitize_args(args)
+    if args.repo:
+        return install_repo(args)
+
     if args.version_kind == 'stable':
         version = args.release
     else:
         version = getattr(args, args.version_kind)
-    # XXX Tango ends here.
 
     version_str = args.version_kind
 
@@ -407,7 +421,7 @@ def make(parser):
     version.set_defaults(
         func=install,
         stable=None,  # XXX deprecated in favor of release
-        release='giant',
+        release=None,  # Set the default release in sanitize_args()
         dev='master',
         version_kind='stable',
         adjust_repos=True,