On 02/18/2011 01:39 PM, Chris Lalancette wrote:
The database is named "conductor", not "aeolus".
Signed-off-by: Chris Lalancette<clalance(a)redhat.com>
---
recipes/aeolus_recipe/manifests/conductor.pp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/aeolus_recipe/manifests/conductor.pp
b/recipes/aeolus_recipe/manifests/conductor.pp
index 2c22d4f..701f224 100644
--- a/recipes/aeolus_recipe/manifests/conductor.pp
+++ b/recipes/aeolus_recipe/manifests/conductor.pp
@@ -227,14 +227,14 @@ define aeolus::site_admin($email="",
$password="", $first_name="", $last_name=""
environment => "RAILS_ENV=production",
command => "/usr/bin/rake dc:create_user[${name}] email=${email}
password=${password} first_name=${first_name} last_name=${last_name}",
logoutput => true,
- unless => "/usr/bin/test `psql aeolus aeolus -P tuples_only -c
\"select count(*) from users where login = '${name}';\"` =
\"1\"",
+ unless => "/usr/bin/test `psql conductor aeolus -P tuples_only -c
\"select count(*) from users where login = '${name}';\"` =
\"1\"",
require => 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,
- unless => "/usr/bin/test `psql aeolus aeolus -P tuples_only -c
\"select count(*) FROM roles INNER JOIN permissions ON (roles.id =
permissions.role_id) INNER JOIN users ON (permissions.user_id = users.id) where roles.name
= 'Administrator' AND users.login = '${name}';\"` =
\"1\"",
+ unless => "/usr/bin/test `psql conductor aeolus -P tuples_only -c
\"select count(*) FROM roles INNER JOIN permissions ON (roles.id =
permissions.role_id) INNER JOIN users ON (permissions.user_id = users.id) where roles.name
= 'Administrator' AND users.login = '${name}';\"` =
\"1\"",
require => Exec[create_site_admin_user]}
}
ACK