From: Sandon Van Ness <sandon@inktank.com>
Date: Fri, 26 Jul 2013 02:50:02 +0000 (-0700)
Subject: Merge remote-tracking branch 'origin/wip-sandon-vm'
X-Git-Tag: 1.1.0~2042
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=41cafb1a1018bd752d285f216a99a6926cd53350;p=teuthology.git

Merge remote-tracking branch 'origin/wip-sandon-vm'

Conflicts:
	teuthology/lock.py
	teuthology/misc.py
	teuthology/task/install.py
---

41cafb1a1018bd752d285f216a99a6926cd53350
diff --cc teuthology/misc.py
index 154456be8,264963afa..13e274a9c
--- a/teuthology/misc.py
+++ b/teuthology/misc.py
@@@ -868,20 -868,12 +868,30 @@@ def stop_daemons_of_type(ctx, type_)
      if exc_info != (None, None, None):
          raise exc_info[0], exc_info[1], exc_info[2]
  
 +def get_system_type(remote):
 +    """
 +    Return this system type (deb or rpm)
 +    """
 +    r = remote.run(
 +        args=[
 +            'sudo','lsb_release', '-is',
 +        ],
 +    stdout=StringIO(),
 +    )
 +    system_value = r.stdout.getvalue().strip()
 +    log.debug("System to be installed: %s" % system_value)
 +    if system_value in ['Ubuntu','Debian']:
 +        return "deb"
 +    if system_value in ['CentOS','Fedora','RedHatEnterpriseServer']:
 +        return "rpm"
 +    return system_value
++
+ def get_distro(ctx):
+     try:
+         os_type = ctx.config.get('os_type', ctx.os_type)
+     except AttributeError:
+         os_type = 'ubuntu'
+     try:
+         return ctx.config['downburst'].get('distro', os_type)
+     except KeyError:
 -        return os_type
++        return os_type
diff --cc teuthology/task/install.py
index f3bdea7bd,a4252d56e..418df1ff0
--- a/teuthology/task/install.py
+++ b/teuthology/task/install.py
@@@ -172,7 -190,13 +172,15 @@@ def _update_rpm_package_list_and_instal
                  pkg=ceph_release)
          if cmp_msg != err_mess.getvalue().strip():
              raise
+ 
 +    remote.run(args=['rm', '-f', rpm_name])
++
+     #Fix Repo Priority
+     remote.run(
+         args=[
+             'sudo', 'sed', '-i', run.Raw('\':a;N;$!ba;s/enabled=1\\ngpg/enabled=1\\npriority=1\\ngpg/g\''), '/etc/yum.repos.d/ceph.repo',
+             ])
+ 
      remote.run(
          args=[
              'sudo', 'yum', 'clean', 'all',