---
.../lib/puppet/parser/functions/return_if.rb | 7 -------
recipes/aeolus_recipe/manifests/conductor.pp | 13 +++++++------
recipes/aeolus_recipe/manifests/deltacloud.pp | 4 ++--
recipes/aeolus_recipe/manifests/image-factory.pp | 6 +++---
recipes/aeolus_recipe/manifests/iwhd.pp | 5 +++--
5 files changed, 15 insertions(+), 20 deletions(-)
delete mode 100644 recipes/aeolus_recipe/lib/puppet/parser/functions/return_if.rb
diff --git a/recipes/aeolus_recipe/lib/puppet/parser/functions/return_if.rb
b/recipes/aeolus_recipe/lib/puppet/parser/functions/return_if.rb
deleted file mode 100644
index 0e943ea..0000000
--- a/recipes/aeolus_recipe/lib/puppet/parser/functions/return_if.rb
+++ /dev/null
@@ -1,7 +0,0 @@
-module Puppet::Parser::Functions
- newfunction(:return_if, :type => :rvalue) do |args|
- condition = args[0]
- value = args[1]
- condition ? value : []
- end
-end
diff --git a/recipes/aeolus_recipe/manifests/conductor.pp
b/recipes/aeolus_recipe/manifests/conductor.pp
index 86c1210..ab679ca 100644
--- a/recipes/aeolus_recipe/manifests/conductor.pp
+++ b/recipes/aeolus_recipe/manifests/conductor.pp
@@ -23,7 +23,7 @@ class aeolus::conductor inherits aeolus {
### Start the aeolus services
file {"/var/lib/condor/condor_config.local":
source => "puppet:///modules/aeolus_recipe/condor_config.local",
- require => return_if($enable_packages,
Package['aeolus-conductor-daemons']) }
+ require => Package['aeolus-conductor-daemons'] }
# condor requires an explicit non-localhost hostname
# TODO we can also kill the configure sequence here instead
exec{"/bin/echo 'hostname/domain should be explicitly set and should not be
localhost.localdomain'":
@@ -42,7 +42,7 @@ class aeolus::conductor inherits aeolus {
ensure => 'running',
enable => true,
hasstatus => true,
- require => [return_if($enable_packages,
Package['aeolus-conductor-daemons']),
+ require => [Package['aeolus-conductor-daemons'],
Rails::Migrate::Db[migrate_aeolus_database],
Service['condor', 'httpd']] }
@@ -50,7 +50,7 @@ class aeolus::conductor inherits aeolus {
ensure => 'running',
enable => true,
hasstatus => true,
- require => [return_if($enable_packages,
Package['rubygem-image_factory_connector']),
+ require => [Package['rubygem-image_factory_connector'],
Service[qpidd]]}
### Initialize and start the aeolus database
@@ -98,7 +98,7 @@ class aeolus::conductor inherits aeolus {
rails::create::db{"create_aeolus_database":
cwd => "/usr/share/aeolus-conductor",
rails_env => "production",
- require => [Postgres::User[aeolus], return_if($enable_packages,
Package['aeolus-conductor'])] }
+ require => [Postgres::User[aeolus],
Package['aeolus-conductor']] }
rails::migrate::db{"migrate_aeolus_database":
cwd => "/usr/share/aeolus-conductor",
rails_env => "production",
@@ -114,7 +114,7 @@ class aeolus::conductor inherits aeolus {
environment => "RAILS_ENV=production",
command => "/usr/bin/rake dc:prepare_repos",
logoutput => true,
- require => return_if($enable_packages,
Package['aeolus-conductor']) }
+ require => Package['aeolus-conductor'] }
### Setup/start solr search service
@@ -138,7 +138,7 @@ class aeolus::conductor inherits aeolus {
enable => 'true',
require => [File['/etc/init.d/solr',
'/etc/init.d/solr'],
Package["java-1.6.0-openjdk"],
- return_if($enable_packages,
Package['aeolus-conductor']),
+ Package['aeolus-conductor'],
Rails::Create::Db['create_aeolus_database']]}
exec{"build_solr_index":
@@ -316,3 +316,4 @@ define aeolus::conductor::hwp($memory='', $cpu='',
$storage='', $architecture=''
user => $login_user,
require => Exec["add-conductor-hwp-${name}"] }
}
+
diff --git a/recipes/aeolus_recipe/manifests/deltacloud.pp
b/recipes/aeolus_recipe/manifests/deltacloud.pp
index af6da11..e1d313e 100644
--- a/recipes/aeolus_recipe/manifests/deltacloud.pp
+++ b/recipes/aeolus_recipe/manifests/deltacloud.pp
@@ -39,8 +39,8 @@ define aeolus::deltacloud($provider_type="",
$port="3002") {
service { "deltacloud-${name}":
ensure => 'running',
enable => true,
- require => [return_if($enable_packages,
Package['rubygem-deltacloud-core']),
- return_if($enable_ec2_packages, Package['rubygem-aws']),
+ require => [Package['rubygem-deltacloud-core'],
+ Package['rubygem-aws'],
File["/etc/init.d/deltacloud-${name}",
"/var/log/deltacloud-${name}"]] }
}
diff --git a/recipes/aeolus_recipe/manifests/image-factory.pp
b/recipes/aeolus_recipe/manifests/image-factory.pp
index 9f55f26..39197a3 100644
--- a/recipes/aeolus_recipe/manifests/image-factory.pp
+++ b/recipes/aeolus_recipe/manifests/image-factory.pp
@@ -29,7 +29,7 @@ class aeolus::image-factory inherits aeolus {
ensure => 'running',
enable => true,
require => [File['/etc/qpidd.conf'],
- return_if($enable_packages,
Package['qpid-cpp-server'])]}
+ Package['qpid-cpp-server']]}
file { "/var/tmp/imagefactory-mock":
ensure => "directory",
mode => 755 }
@@ -37,8 +37,8 @@ class aeolus::image-factory inherits aeolus {
ensure => 'running',
enable => true,
hasstatus => true,
- require => return_if($enable_packages, Package['libvirt'])}
- $requires = [return_if($enable_packages, Package['imagefactory']),
+ require => Package['libvirt']}
+ $requires = [Package['imagefactory'],
File['/var/tmp/imagefactory-mock'],
Service[qpidd], Service[libvirtd],
Rails::Seed::Db[seed_aeolus_database]]
diff --git a/recipes/aeolus_recipe/manifests/iwhd.pp
b/recipes/aeolus_recipe/manifests/iwhd.pp
index 7be92ec..c9fa956 100644
--- a/recipes/aeolus_recipe/manifests/iwhd.pp
+++ b/recipes/aeolus_recipe/manifests/iwhd.pp
@@ -19,13 +19,13 @@ class aeolus::iwhd inherits aeolus {
service { 'mongod':
ensure => 'running',
enable => true,
- require => [return_if($enable_packages, Package['mongodb-server']),
File["/data/db"]]}
+ require => [Package['mongodb-server'], File["/data/db"]]}
service { 'iwhd':
ensure => 'running',
enable => true,
hasstatus => true,
- require => [return_if($enable_packages, Package['iwhd']),
+ require => [Package['iwhd'],
Service[mongod]]}
# XXX ugly hack but iwhd might take some time to come up
@@ -63,3 +63,4 @@ define aeolus::create_bucket(){
logoutput => true,
require => [Exec['iwhd_startup_pause'], Package[curl]] }
}
+
--
1.7.4.2