Changing the defaults provider defintion from 'rpm' to 'yum'
will change the behavior to install missing packages via yum.
---
recipes/aeolus_recipe/aeolus_recipe.pp | 2 ++
recipes/aeolus_recipe/aeolus_uninstall.pp | 2 ++
recipes/aeolus_recipe/manifests/conductor.pp | 5 ++---
recipes/aeolus_recipe/manifests/defaults.pp | 10 ++++++++++
recipes/aeolus_recipe/manifests/deltacloud.pp | 4 ++--
recipes/aeolus_recipe/manifests/image-factory.pp | 5 ++---
recipes/aeolus_recipe/manifests/iwhd.pp | 4 ++--
7 files changed, 22 insertions(+), 10 deletions(-)
create mode 100644 recipes/aeolus_recipe/manifests/defaults.pp
diff --git a/recipes/aeolus_recipe/aeolus_recipe.pp
b/recipes/aeolus_recipe/aeolus_recipe.pp
index f2f4110..dd05dc3 100644
--- a/recipes/aeolus_recipe/aeolus_recipe.pp
+++ b/recipes/aeolus_recipe/aeolus_recipe.pp
@@ -24,6 +24,7 @@
# Modules used by the recipe
import "aeolus_recipe/aeolus"
+import "aeolus_recipe/defaults"
# include the various aeolus components
include aeolus::conductor
@@ -67,3 +68,4 @@ aeolus::conductor::hwp{"hwp1":
login_user => 'admin',
login_password => 'password',
require => Aeolus::Site_admin["admin"] }
+
diff --git a/recipes/aeolus_recipe/aeolus_uninstall.pp
b/recipes/aeolus_recipe/aeolus_uninstall.pp
index 6f005a2..c0b0eae 100644
--- a/recipes/aeolus_recipe/aeolus_uninstall.pp
+++ b/recipes/aeolus_recipe/aeolus_uninstall.pp
@@ -24,6 +24,7 @@
# Modules used by the recipe
import "aeolus_recipe/aeolus"
+import "aeolus_recipe/defaults"
# disable the various aeolus components
include aeolus::conductor::disabled
@@ -33,3 +34,4 @@ include aeolus::image-factory::disabled
aeolus::deltacloud::disabled{"mock": }
aeolus::deltacloud::disabled{"ec2-us-east-1": }
aeolus::deltacloud::disabled{"ec2-us-west-1": }
+
diff --git a/recipes/aeolus_recipe/manifests/conductor.pp
b/recipes/aeolus_recipe/manifests/conductor.pp
index 02bc120..d1ac9a9 100644
--- a/recipes/aeolus_recipe/manifests/conductor.pp
+++ b/recipes/aeolus_recipe/manifests/conductor.pp
@@ -6,11 +6,11 @@ class aeolus::conductor inherits aeolus {
package {['aeolus-conductor',
'aeolus-conductor-daemons',
'aeolus-conductor-doc']:
- provider => 'yum', ensure => 'installed'}
+ ensure => 'installed'}
# to be renamed to aeolus-connector
package {'rubygem-image_factory_connector':
- provider => 'yum', ensure => 'installed'}
+ ensure => 'installed'}
file {"/var/lib/aeolus-conductor":
ensure => directory }
@@ -127,7 +127,6 @@ class aeolus::conductor inherits aeolus {
}
# TODO we manually have to install java for solr, we should remove this once this is a
dep in the solr rpm
package{"java-1.6.0-openjdk":
- provider => "yum",
ensure => "installed" }
service{"solr":
hasstatus => "false",
diff --git a/recipes/aeolus_recipe/manifests/defaults.pp
b/recipes/aeolus_recipe/manifests/defaults.pp
new file mode 100644
index 0000000..f5c74c3
--- /dev/null
+++ b/recipes/aeolus_recipe/manifests/defaults.pp
@@ -0,0 +1,10 @@
+#Set up some defaults
+
+#Use rpm because it will fail because we don't provide source.
+#This is an easy mechanism to have puppet fail when packages
+#aren't installed, but also an easy way to tune it back to
+#the behavior of installing packages that are missing by
+#switching back to yum
+
+Package {provider => 'rpm'}
+
diff --git a/recipes/aeolus_recipe/manifests/deltacloud.pp
b/recipes/aeolus_recipe/manifests/deltacloud.pp
index 92afe2d..f8c460b 100644
--- a/recipes/aeolus_recipe/manifests/deltacloud.pp
+++ b/recipes/aeolus_recipe/manifests/deltacloud.pp
@@ -5,14 +5,14 @@ class aeolus::deltacloud::core {
include aeolus
package { 'rubygem-deltacloud-core':
- provider => 'yum', ensure => 'installed', require
=> Yumrepo['aeolus_arch', 'aeolus_noarch']}
+ ensure => 'installed', require =>
Yumrepo['aeolus_arch', 'aeolus_noarch']}
}
class aeolus::deltacloud::ec2 {
### Install the driver-specific components
# install ec2 support,
package { "rubygem-aws":
- provider => 'yum', ensure => 'installed' }
+ ensure => 'installed' }
}
diff --git a/recipes/aeolus_recipe/manifests/image-factory.pp
b/recipes/aeolus_recipe/manifests/image-factory.pp
index 96a7156..f28c7cf 100644
--- a/recipes/aeolus_recipe/manifests/image-factory.pp
+++ b/recipes/aeolus_recipe/manifests/image-factory.pp
@@ -3,15 +3,14 @@
class aeolus::image-factory inherits aeolus {
package { 'libvirt':
- provider => 'yum',
ensure=> 'installed'
}
package { 'imagefactory':
- provider => 'yum', ensure => 'installed',
+ ensure => 'installed',
require => [Yumrepo['aeolus_arch', 'aeolus_noarch']]
}
package { 'qpid-cpp-server':
- provider => 'yum', ensure => 'installed' }
+ ensure => 'installed' }
### Configure pulp to fetch from Fedora
# TODO uncomment when factory/warehouse uses pulp
diff --git a/recipes/aeolus_recipe/manifests/iwhd.pp
b/recipes/aeolus_recipe/manifests/iwhd.pp
index 9840cc9..d012258 100644
--- a/recipes/aeolus_recipe/manifests/iwhd.pp
+++ b/recipes/aeolus_recipe/manifests/iwhd.pp
@@ -3,11 +3,11 @@
class aeolus::iwhd inherits aeolus {
### Install the deltacloud components
package { 'iwhd':
- provider => 'yum', ensure => 'installed',
+ ensure => 'installed',
require => Yumrepo['aeolus_arch', 'aeolus_noarch'] }
package { 'mongodb-server':
- provider => 'yum', ensure => 'installed' }
+ ensure => 'installed' }
### Start the aeolus services
file { "/data": ensure => 'directory' }
--
1.7.4.2