[PATCH aeolus-configure] BZ835131 configure errors after upgrade

Steve Linabery slinaber at redhat.com
Tue Jun 26 17:16:28 UTC 2012


Change the behavior of site_admin.pp to rely on a db check
(via 'rake dc:admin_exists' task) instead of a filesystem check.
---
 recipes/aeolus/manifests/conductor/site_admin.pp |    7 +------
 1 files changed, 1 insertions(+), 6 deletions(-)

diff --git a/recipes/aeolus/manifests/conductor/site_admin.pp b/recipes/aeolus/manifests/conductor/site_admin.pp
index 4c3a91d..4f90fca 100644
--- a/recipes/aeolus/manifests/conductor/site_admin.pp
+++ b/recipes/aeolus/manifests/conductor/site_admin.pp
@@ -5,17 +5,12 @@ define aeolus::conductor::site_admin($email="", $password="", $first_name="", $l
          environment => "RAILS_ENV=production",
          command     => "/usr/bin/rake dc:create_user[${name},${password},${email},${first_name},${last_name}]",
          logoutput   => true,
-         creates     => "/var/lib/aeolus-conductor/production.admin",
+         unless      => '/usr/bin/rake dc:admin_exists',
          require     => Aeolus::Rails::Seed::Db["seed_aeolus_database"]}
   exec{"grant_site_admin_privs":
          cwd         => '/usr/share/aeolus-conductor',
          environment => "RAILS_ENV=production",
          command     => "/usr/bin/rake dc:site_admin[${name}]",
          logoutput   => true,
-         creates     => "/var/lib/aeolus-conductor/production.admin",
          require     => Exec[create_site_admin_user]}
-  file{"/var/lib/aeolus-conductor/production.admin":
-         ensure => present,
-         recurse => true,
-         require => Exec['grant_site_admin_privs']}
 }
-- 
1.7.6.5




More information about the aeolus-devel mailing list