install.py: update for rpms

Change centos to CentOS for the release name.  Update the path
to the ceph-release rpm to match the dev repos.

Signed-off-by: Gary Lowell  <gary.lowell@inktank.com>

diff --git a/ceph_deploy/install.py b/ceph_deploy/install.py
index ba5b0da0e352c09d76c7605c2b11f7609d31b008..b56189d2c3d3fabd70d17be00cade824c55af2da 100644 (file)
--- a/ceph_deploy/install.py
+++ b/ceph_deploy/install.py
@@ -34,7 +34,7 @@ def install_centos(release, codename, version_kind, version):
             )
 
     subprocess.call(
-        args=['rpm', '-Uvh','--quiet', '{url}el6/x86_64/ceph-release-1-0.el6.noarch.rpm'.format(
+        args=['rpm', '-Uvh','--quiet', '{url}noarch/ceph-release-1-0.el6.noarch.rpm'.format(
             url=url
             )]
         )
@@ -178,12 +178,12 @@ def install(args):
         sudo = args.pushy('ssh+sudo:{hostname}'.format(hostname=hostname))
         lsb_release_r = sudo.compile(lsb.lsb_release)
         (distro, release, codename) = lsb_release_r()
-        log.debug('Distro %s codename %s', distro, codename)
+        log.debug('Distro %s release %s codename %s', distro, release, codename)
 
         if (distro == 'Debian' or distro == 'Ubuntu'):
             log.debug('Installing on host %s ...', hostname)
             install_r = sudo.compile(install_debian)
-        elif (distro == 'centos'):
+        elif (distro == 'CentOS'):
             log.debug('Installing on host %s ...', hostname)
             install_r = sudo.compile(install_centos)
         else: