[PATCH configure 1/1] For RHEL, point to RHEL 6 repos

[Mike Orazi]

---
 recipes/deltacloud_recipe/manifests/deltacloud.pp |   59 +++++++++++++++------
 1 files changed, 43 insertions(+), 16 deletions(-)

diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp
index 4c6cdb6..b7cd04a 100644
--- a/recipes/deltacloud_recipe/manifests/deltacloud.pp
+++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp
@@ -28,20 +28,47 @@ if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {

# Base deltacloud class
 class deltacloud {
-  # Setup repos which to pull deltacloud components
-  yumrepo{"${name}_arch":
-            name     => "${name}_arch",
-            descr    => "${name}_arch",
-            baseurl  => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$base...',
-            enabled  => 1, gpgcheck => 0}
-  yumrepo{"${name}_noarch":
-            name     => "${name}_noarch",
-            descr    => "${name}_noarch",
-            baseurl  => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/noarc...',
-            enabled  => 1, gpgcheck => 0}
-  yumrepo{"${name}_pulp":
-            name     => "${name}_pulp",
-            descr    => "${name}_pulp",
-            baseurl  => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
-            enabled  => 1, gpgcheck => 0}
+  case $operatingsystem {
+      fedora: {
+          # Setup repos which to pull deltacloud components
+          yumrepo{"${name}_arch":
+                name     => "${name}_arch",
+                descr    => "${name}_arch",
+                baseurl  => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/$base...',
+                enabled  => 1, gpgcheck => 0}
+      yumrepo{"${name}_noarch":
+                name     => "${name}_noarch",
+                descr    => "${name}_noarch",
+                baseurl  => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/noarc...',
+                enabled  => 1, gpgcheck => 0}
+      yumrepo{"${name}_pulp":
+                name     => "${name}_pulp",
+                descr    => "${name}_pulp",
+                baseurl  => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
+                enabled  => 1, gpgcheck => 0}
+       }
+       # TODO:  Don't hardcode these repos to RHEL-6
+       #  The issue is that $releasever resolves to something like 6Server
+       #  so we either need to have a repo per RHEL variant, or we need
+       #  to have smarter logic here
+       redhat: {
+          # Setup repos which to pull deltacloud components
+          yumrepo{"${name}_arch":
+                name     => "${name}_arch",
+                descr    => "${name}_arch",
+                baseurl  => 'http://repos.fedorapeople.org/repos/aeolus/packages/rhel-6/$basearch',
+                enabled  => 1, gpgcheck => 0}
+          yumrepo{"${name}_noarch":
+                name     => "${name}_noarch",
+                descr    => "${name}_noarch",
+                baseurl  => 'http://repos.fedorapeople.org/repos/aeolus/packages/rhel-6/noarch',
+                enabled  => 1, gpgcheck => 0}
+          yumrepo{"${name}_pulp":
+                name     => "${name}_pulp",
+                descr    => "${name}_pulp",
+                baseurl  => 'http://repos.fedorapeople.org/repos/pulp/pulp/rhel5/$basearch/',
+                enabled  => 1, gpgcheck => 0}
+       }
+  }
 }
+