From: Travis Rhoden <trhoden@redhat.com>
Date: Thu, 9 Jul 2015 23:59:42 +0000 (-0700)
Subject: [RM-12147] Set arg defaults in correct places
X-Git-Tag: v1.5.26~9^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9552fb18b1ab9e02926005c5d1fc85b385567654;p=ceph-deploy.git

[RM-12147] Set arg defaults in correct places

Signed-off-by: Travis Rhoden <trhoden@redhat.com>
---

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index 2e6e80c..7081ab8 100644
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -479,6 +479,13 @@ def make(parser):
                 or tag (default: %(default)s)',
     )
 
+    version.set_defaults(
+        stable=None,  # XXX deprecated in favor of release
+        release=None,  # Set the default release in sanitize_args()
+        dev='master',
+        version_kind='stable',
+    )
+
     parser.add_argument(
         '--mon',
         dest='install_mon',
@@ -535,15 +542,6 @@ def make(parser):
         help='install packages without modifying source repos',
     )
 
-    parser.set_defaults(
-        func=install,
-        stable=None,  # XXX deprecated in favor of release
-        release=None,  # Set the default release in sanitize_args()
-        dev='master',
-        version_kind='stable',
-        adjust_repos=True,
-    )
-
     parser.add_argument(
         '--repo',
         action='store_true',
@@ -582,6 +580,7 @@ def make(parser):
 
     parser.set_defaults(
         func=install,
+        adjust_repos=True,
     )