The current repodefs conflict with the current installation guide and
contain old URLs that are no longer valid. The current installation
approach assumes that the user will wget the appropriate yum repo files
as per the install guide.
---
recipes/aeolus/manifests/deltacloud.pp | 2 +-
recipes/aeolus/manifests/image-factory.pp | 3 +--
recipes/aeolus/manifests/init.pp | 22 ----------------------
recipes/aeolus/manifests/iwhd.pp | 3 +--
4 files changed, 3 insertions(+), 27 deletions(-)
diff --git a/recipes/aeolus/manifests/deltacloud.pp
b/recipes/aeolus/manifests/deltacloud.pp
index a274e67..dc367da 100644
--- a/recipes/aeolus/manifests/deltacloud.pp
+++ b/recipes/aeolus/manifests/deltacloud.pp
@@ -5,7 +5,7 @@ class aeolus::deltacloud::core {
include aeolus
package { 'deltacloud-core':
- ensure => 'installed', require =>
Yumrepo['aeolus_arch', 'aeolus_noarch']}
+ ensure => 'installed'}
}
class aeolus::deltacloud::ec2 {
diff --git a/recipes/aeolus/manifests/image-factory.pp
b/recipes/aeolus/manifests/image-factory.pp
index 1a75bd6..27c5512 100644
--- a/recipes/aeolus/manifests/image-factory.pp
+++ b/recipes/aeolus/manifests/image-factory.pp
@@ -6,8 +6,7 @@ class aeolus::image-factory inherits aeolus {
ensure=> 'installed'
}
package { 'imagefactory':
- ensure => 'installed',
- require => [Yumrepo['aeolus_arch', 'aeolus_noarch']]
+ ensure => 'installed'
}
package { 'qpid-cpp-server':
ensure => 'installed' }
diff --git a/recipes/aeolus/manifests/init.pp b/recipes/aeolus/manifests/init.pp
index 1144293..b370064 100644
--- a/recipes/aeolus/manifests/init.pp
+++ b/recipes/aeolus/manifests/init.pp
@@ -30,28 +30,6 @@ if $aeolus_enable_security == "true" or
$aeolus_enable_security == "1" {
# Base aeolus class
class aeolus {
package{'curl': ensure => 'installed'}
-
- # Setup repos which to pull aeolus components
- # 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'
}
-
- yumrepo{"${name}_arch":
- name => "${name}_arch",
- descr => "${name}_arch",
- baseurl =>
"http://repos.fedorapeople.org/repos/aeolus/packages/${base_url_release}/\$basearch",
- enabled => 0, gpgcheck => 0}
- yumrepo{"${name}_noarch":
- name => "${name}_noarch",
- descr => "${name}_noarch",
- baseurl =>
"http://repos.fedorapeople.org/repos/aeolus/packages/${base_url_release}/noarch",
- enabled => 0, gpgcheck => 0}
-
}
# Create a new provider in aeolus
diff --git a/recipes/aeolus/manifests/iwhd.pp b/recipes/aeolus/manifests/iwhd.pp
index 6ba8dce..be57736 100644
--- a/recipes/aeolus/manifests/iwhd.pp
+++ b/recipes/aeolus/manifests/iwhd.pp
@@ -3,8 +3,7 @@
class aeolus::iwhd inherits aeolus {
### Install the deltacloud components
package { 'iwhd':
- ensure => 'installed',
- require => Yumrepo['aeolus_arch', 'aeolus_noarch'] }
+ ensure => 'installed' }
package { 'mongodb-server':
ensure => 'installed' }
--
1.7.4.4
Show replies by thread
On 07/08/2011 01:42 PM, Mike Orazi wrote:
The current repodefs conflict with the current installation guide
and
contain old URLs that are no longer valid. The current installation
approach assumes that the user will wget the appropriate yum repo files
as per the install guide.
---
recipes/aeolus/manifests/deltacloud.pp | 2 +-
recipes/aeolus/manifests/image-factory.pp | 3 +--
recipes/aeolus/manifests/init.pp | 22 ----------------------
recipes/aeolus/manifests/iwhd.pp | 3 +--
4 files changed, 3 insertions(+), 27 deletions(-)
Ack. With some trailing whitespace noted.