Merge "Fix kilo repo installation for RedHat"

files/RPM-GPG-KEY-RDO-Kilo

@@ -1,52 +1,63 @@
 -----BEGIN PGP PUBLIC KEY BLOCK-----
 Version: GnuPG v1
 
-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
-tqA=
-=vBYB
+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
+MZv87XgaHiLxTrkPCEhOX1U=
+=8/+k
 -----END PGP PUBLIC KEY BLOCK-----

manifests/repo/redhat/params.pp

@@ -21,8 +21,14 @@ class openstack_extras::repo::redhat::params
                       }
 
   case $::operatingsystem {
-    centos, redhat, scientific, slc: { $dist = 'epel' }
-    fedora: { $dist = 'fedora' }
+    centos, redhat, scientific, slc: {
+      $dist_full  = 'epel-'
+      $dist_short = 'el'
+    }
+    fedora: {
+      $dist_full  = 'fedora-'
+      $dist_short = 'f'
+    }
     default: {
       warning('Unrecognised operatingsystem')
     }

manifests/repo/redhat/redhat.pp

@@ -78,10 +78,15 @@ class openstack_extras::repo::redhat::redhat(
 
   if $manage_rdo {
     $release_cap = capitalize($release)
-    $_dist = $::openstack_extras::repo::redhat::params::dist
+    # In kilo the URL pattern changed
+    if $release < 'kilo' { # Lexicographically before 'k' release
+      $_dist = $::openstack_extras::repo::redhat::params::dist_full
+    } else {
+      $_dist = $::openstack_extras::repo::redhat::params::dist_short
+    }
 
     $rdo_hash = { 'rdo-release' => {
-        'baseurl'  => "http://repos.fedorapeople.org/repos/openstack/openstack-${release}/${_dist}-${::operatingsystemmajrelease}/",
+        'baseurl'  => "http://repos.fedorapeople.org/repos/openstack/openstack-${release}/${_dist}${::operatingsystemmajrelease}/",
         'descr'    => "OpenStack ${release_cap} Repository",
         'priority' => $::openstack_extras::repo::redhat::params::rdo_priority,
         'gpgkey'   => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-${release_cap}",

spec/classes/openstack_extras_repo_redhat_redhat_spec.rb

@@ -49,7 +49,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7/",
+        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/",
         :descr      => "OpenStack Kilo Repository",
         :priority   => 98,
         :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo",
@@ -148,7 +148,7 @@ describe 'openstack_extras::repo::redhat::redhat' do
       end
 
       it { should contain_yumrepo('rdo-release').with(
-        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/epel-7/",
+        :baseurl    => "http://repos.fedorapeople.org/repos/openstack/openstack-kilo/el7/",
         :descr      => "OpenStack Kilo Repository",
         :gpgkey     => "file:///etc/pki/rpm-gpg/RPM-GPG-KEY-RDO-Kilo",
         :proxy     => "http://my.proxy.com:8000"