From: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
Date: Tue, 16 Oct 2018 11:09:38 +0000 (+0200)
Subject: teuthology-openstack: do not deploy cluster by default
X-Git-Tag: 1.1.0~211^2~71
X-Git-Url: http://git.apps.os.sepia.ceph.com/?a=commitdiff_plain;h=ae820b9df61ea30592280ebee3bd98e1d2e6243b;p=teuthology.git

teuthology-openstack: do not deploy cluster by default

We do not want to deploy cluster by mistake, so it is
reasonable to have dedicated option for cluster deployment,
like --setup.

Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@suse.de>

Conflicts:
	teuthology/openstack/__init__.py
---

diff --git a/scripts/openstack.py b/scripts/openstack.py
index c8179b3d8f..f8e0cd5e28 100644
--- a/scripts/openstack.py
+++ b/scripts/openstack.py
@@ -220,6 +220,11 @@ def get_openstack_parser():
         type=int,
         default=0,
     )
+    parser.add_argument(
+        '--setup',
+        action='store_true', default=False,
+        help='deploy the cluster, if it does not exist',
+    )
     parser.add_argument(
         '--teardown',
         action='store_true', default=None,
diff --git a/teuthology/openstack/__init__.py b/teuthology/openstack/__init__.py
index 790f68406d..35196d9a97 100644
--- a/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@ -598,7 +598,12 @@ class TeuthologyOpenStack(OpenStack):
                 self.key_filename = keyfile
                 break
         self.verify_openstack()
-        self.setup()
+        if self.args.teardown:
+            self.instance = OpenStackInstance(self.server_name())
+            self.teardown()
+            return 0
+        if self.args.setup:
+            self.setup()
         exit_code = 0
         if self.args.suite:
             if self.args.wait:
@@ -741,6 +746,7 @@ class TeuthologyOpenStack(OpenStack):
                                     '--controller-disk'):
                 del original_argv[0:2]
             elif original_argv[0] in ('--teardown',
+                                      '--setup',
                                       '--upload',
                                       '--no-canonical-tags'):
                 del original_argv[0]