]> git.apps.os.sepia.ceph.com Git - teuthology.git/commitdiff
openstack: cleanup stale comments
authorKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Fri, 11 Oct 2019 04:46:08 +0000 (06:46 +0200)
committerKyr Shatskyy <kyrylo.shatskyy@gmail.com>
Mon, 14 Oct 2019 22:11:40 +0000 (00:11 +0200)
Signed-off-by: Kyr Shatskyy <kyrylo.shatskyy@gmail.com>
teuthology/openstack/__init__.py

index 0cbff1a6c3d6e9f0e49916258d97cd9cf52b8261..4128f555881395cddccf3a04293cebc03ef7e356 100644 (file)
@@ -1028,12 +1028,7 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
         and a few other values are substituted.
         """
         path = tempfile.mktemp()
-        # if self.user_data.startswith('/'):
-        #     user_data = self.user_data
-        # else:
-        #     user_data = os.path.join(os.path.dirname(__file__),
-        #                              '../..', self.user_data)
-        # template = open(user_data).read()
+
         with open(os.path.dirname(__file__) + '/bootstrap-teuthology.sh', 'rb') as f:
             b64_bootstrap = base64.b64encode(f.read())
             bootstrap_content = str(b64_bootstrap.decode())
@@ -1058,10 +1053,7 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
                 openrc_sh += 'export %s=%s\n' % (var, value)
         b64_openrc_sh = base64.b64encode(openrc_sh.encode())
         openrc_sh_content = str(b64_openrc_sh.decode())
-        # if self.args.upload:
-        #     upload = '--archive-upload ' + self.args.archive_upload
-        # else:
-        #     upload = ''
+
         network = OpenStack().get_network()
         ceph_workbench = ''
         if self.args.ceph_workbench_git_url:
@@ -1069,7 +1061,7 @@ ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/
                                self.args.ceph_workbench_branch)
             ceph_workbench += (" --ceph-workbench-git-url " +
                                self.args.ceph_workbench_git_url)
-        # canonical_tags = "--no-canonical-tags" if self.args.no_canonical_tags else ""
+
         setup_options = [
             '--keypair %s' % self.key_pair(),
             '--selfname %s' % self.args.name,