slight reworking of morazi's original patch --- recipes/deltacloud_recipe/manifests/deltacloud.pp | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp index 4c6cdb6..bfb6183 100644 --- a/recipes/deltacloud_recipe/manifests/deltacloud.pp +++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp @@ -28,20 +28,29 @@ if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {
# Base deltacloud class class deltacloud { + # 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 + $base_url_release = $operatingsystem ? { 'fedora' => "fedora-$releasever", + 'redhat' => 'rhel-6' } + $pulp_base_url_release = $operatingsystem ? { 'fedora' => "fedora-13", + 'redhat' => 'rhel5' } + # 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...', + baseurl => "http://repos.fedorapeople.org/repos/aeolus/packages/$%7Bbase_url_release%7D/...", enabled => 1, gpgcheck => 0} yumrepo{"${name}_noarch": name => "${name}_noarch", descr => "${name}_noarch", - baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/noarc...', + baseurl => "http://repos.fedorapeople.org/repos/aeolus/packages/$%7Bbase_url_release%7D/...", enabled => 1, gpgcheck => 0} yumrepo{"${name}_pulp": name => "${name}_pulp", descr => "${name}_pulp", - baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/', + baseurl => "http://repos.fedorapeople.org/repos/pulp/pulp/$%7Bpulp_base_url_release%7D/%...", enabled => 1, gpgcheck => 0} }
On 02/16/2011 02:29 PM, Mohammed Morsi wrote:
slight reworking of morazi's original patch
recipes/deltacloud_recipe/manifests/deltacloud.pp | 15 ++++++++++++--- 1 files changed, 12 insertions(+), 3 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp index 4c6cdb6..bfb6183 100644 --- a/recipes/deltacloud_recipe/manifests/deltacloud.pp +++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp @@ -28,20 +28,29 @@ if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {
# Base deltacloud class class deltacloud {
- # 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
- $base_url_release = $operatingsystem ? { 'fedora' => "fedora-$releasever",
'redhat' => 'rhel-6' }
- $pulp_base_url_release = $operatingsystem ? { 'fedora' => "fedora-13",
'redhat' => 'rhel5' }
- # 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/$basearch',
yumrepo{"${name}_noarch": name => "${name}_noarch", descr => "${name}_noarch",baseurl => "http://repos.fedorapeople.org/repos/aeolus/packages/${base_url_release}/\$basearch", enabled => 1, gpgcheck => 0}
baseurl => 'http://repos.fedorapeople.org/repos/aeolus/packages/fedora-$releasever/noarch',
yumrepo{"${name}_pulp": name => "${name}_pulp", descr => "${name}_pulp",baseurl => "http://repos.fedorapeople.org/repos/aeolus/packages/${base_url_release}/noarch", enabled => 1, gpgcheck => 0}
baseurl => 'http://repos.fedorapeople.org/repos/pulp/pulp/fedora-13/$basearch/',
}baseurl => "http://repos.fedorapeople.org/repos/pulp/pulp/${pulp_base_url_release}/\$basearch/", enabled => 1, gpgcheck => 0}
ACK -- I like it!
aeolus-devel@lists.fedorahosted.org