Merge pull request #721 from dachary/wip-openstack-git-urls

openstack: update ~/.teuthology with --git-ceph{,qa-suite}-url

diff --cc scripts/openstack.py
Simple merge

diff --cc teuthology/openstack/__init__.py
index 1fef2698a0624367b700b0f06703de06e75a302b,f11a3f9286aef364856e256cbf43d3580b22be8e..164a06244e21ac6fe3d71d5d0bf1e74d08bbce1c
--- 1/teuthology/openstack/__init__.py
--- 2/teuthology/openstack/__init__.py
+++ b/teuthology/openstack/__init__.py
@@@ -486,35 -428,28 +488,42 @@@ class TeuthologyOpenStack(OpenStack)
                  del original_argv[0]
              else:
                  argv.append(original_argv.pop(0))
+         for arg in ('ceph_git_url', 'ceph_qa_suite_git_url'):
+             if getattr(self.args, arg):
+                 command = (
+                     "perl -pi -e 's|.*{arg}.*|{arg}: {value}|'"
+                     " ~/.teuthology.yaml"
+                 ).format(arg=arg, value=getattr(self.args, arg))
+                 self.ssh(command)
          argv.append('/home/' + self.username +
 -                    '/teuthology/teuthology/openstack/test/openstack.yaml')
 +                    '/teuthology/teuthology/openstack/openstack.yaml')
          command = (
              "source ~/.bashrc_teuthology ; " + self.teuthology_suite + " " +
              " --machine-type openstack " +
              " ".join(map(lambda x: "'" + x + "'", argv))
          )
-         print self.ssh(command)
+         self.ssh(command)
  
 +    def reminders(self):
 +        if self.args.key_filename:
 +            identity = '-i ' + self.args.key_filename + ' '
 +        else:
 +            identity = ''
 +        if self.args.upload:
 +            upload = 'upload to            : ' + self.args.archive_upload
 +        else:
 +            upload = ''
 +        log.info("""
 +pulpito web interface: http://{ip}:8081/
 +ssh access           : ssh {identity}{username}@{ip} # logs in /usr/share/nginx/html
 +{upload}""".format(ip=self.instance.get_floating_ip_or_ip(),
 +                   username=self.username,
 +                   identity=identity,
 +                   upload=upload))
 +
      def setup(self):
 -        """
 -        Create the teuthology cluster if it does not already exists
 -        and return its IP address.
 -        """
 -        if not self.cluster_exists():
 +        self.instance = OpenStackInstance(self.args.name)
 +        if not self.instance.exists():
              if self.provider != 'rackspace':
                  self.create_security_group()
              self.create_cluster()

diff --cc teuthology/openstack/setup-openstack.sh
Simple merge