From: Mohammed Morsi <mmorsi(a)redhat.com>
Signed-off-by: Chris Lalancette <clalance(a)redhat.com>
---
recipes/aeolus_recipe/aeolus_recipe.pp | 2 +-
recipes/aeolus_recipe/aeolus_stop_services.pp | 2 +-
recipes/aeolus_recipe/aeolus_uninstall.pp | 2 +-
recipes/aeolus_recipe/manifests/aeolus.pp | 2 +-
recipes/aeolus_recipe/manifests/aggregator.pp | 128 -------------------------
recipes/aeolus_recipe/manifests/conductor.pp | 128 +++++++++++++++++++++++++
6 files changed, 132 insertions(+), 132 deletions(-)
delete mode 100644 recipes/aeolus_recipe/manifests/aggregator.pp
create mode 100644 recipes/aeolus_recipe/manifests/conductor.pp
diff --git a/recipes/aeolus_recipe/aeolus_recipe.pp
b/recipes/aeolus_recipe/aeolus_recipe.pp
index a97b250..af6a6ac 100644
--- a/recipes/aeolus_recipe/aeolus_recipe.pp
+++ b/recipes/aeolus_recipe/aeolus_recipe.pp
@@ -26,7 +26,7 @@
import "aeolus_recipe/aeolus"
# include the various aeolus components
-include aeolus::aggregator
+include aeolus::conductor
include aeolus::core
include aeolus::image-factory
include aeolus::iwhd
diff --git a/recipes/aeolus_recipe/aeolus_stop_services.pp
b/recipes/aeolus_recipe/aeolus_stop_services.pp
index b98c11e..6d9993e 100644
--- a/recipes/aeolus_recipe/aeolus_stop_services.pp
+++ b/recipes/aeolus_recipe/aeolus_stop_services.pp
@@ -25,7 +25,7 @@
# Modules used by the recipe
import "aeolus_recipe/aeolus"
-$services = ["aggregator", "core", 'iwhd',
'image-factory']
+$services = ["conductor", "core", 'iwhd',
'image-factory']
# stop aeolus services
dc::service{$services:
diff --git a/recipes/aeolus_recipe/aeolus_uninstall.pp
b/recipes/aeolus_recipe/aeolus_uninstall.pp
index 4ab0bc7..c1b02c4 100644
--- a/recipes/aeolus_recipe/aeolus_uninstall.pp
+++ b/recipes/aeolus_recipe/aeolus_uninstall.pp
@@ -26,7 +26,7 @@
import "aeolus_recipe/aeolus"
# disable the various aeolus components
-include aeolus::aggregator::disabled
+include aeolus::conductor::disabled
include aeolus::core::disabled
include aeolus::iwhd::disabled
include aeolus::image-factory::disabled
diff --git a/recipes/aeolus_recipe/manifests/aeolus.pp
b/recipes/aeolus_recipe/manifests/aeolus.pp
index d0f1e60..f4242d1 100644
--- a/recipes/aeolus_recipe/manifests/aeolus.pp
+++ b/recipes/aeolus_recipe/manifests/aeolus.pp
@@ -7,7 +7,7 @@ import "rails"
import "selinux"
import "ntp"
-import "aggregator"
+import "conductor"
import "core"
import "iwhd"
import "image-factory"
diff --git a/recipes/aeolus_recipe/manifests/aggregator.pp
b/recipes/aeolus_recipe/manifests/aggregator.pp
deleted file mode 100644
index 8e8769f..0000000
--- a/recipes/aeolus_recipe/manifests/aggregator.pp
+++ /dev/null
@@ -1,128 +0,0 @@
-# Aeolus aggregator puppet definitions
-
-class aeolus::aggregator inherits aeolus {
- ### Install the aeolus components
- # specific versions of these two packages are needed and we need to pull the third
in
- package { 'rubygem-deltacloud-client':
- provider => 'yum', ensure => 'installed', require
=> Yumrepo['aeolus_arch', 'aeolus_noarch'] }
-
- package {['deltacloud-aggregator',
- 'deltacloud-aggregator-daemons',
- 'deltacloud-aggregator-doc']:
- provider => 'yum', ensure => 'installed',
- require => Package['rubygem-deltacloud-client',
- 'rubygem-deltacloud-image-builder-agent',
- 'iwhd']}
-
- ### Setup selinux for aeolus
- selinux::mode{"permissive":}
-
- ### Setup firewall for aeolus
- firewall::rule{"http": destination_port => '80'}
-
- ### Start the aeolus services
- file {"/var/lib/condor/condor_config.local":
- source => "puppet:///modules/aeolus_recipe/condor_config.local",
- require => Package['deltacloud-aggregator-daemons'] }
- service { ['condor', 'httpd']:
- ensure => 'running',
- enable => true,
- require => File['/var/lib/condor/condor_config.local'] }
- service { ['deltacloud-aggregator',
- 'deltacloud-condor_refreshd',
- 'deltacloud-dbomatic']:
- ensure => 'running',
- enable => true,
- hasstatus => true,
- require => [Package['deltacloud-aggregator-daemons'],
- Rails::Migrate::Db[migrate_aeolus_database],
- Service[condor]] }
-
- ### Initialize and start the aeolus database
- # Right now we configure and start postgres, at some point I want
- # to make the db that gets setup configurable
- include postgres::server
- file { "/var/lib/pgsql/data/pg_hba.conf":
- source => "puppet:///modules/aeolus_recipe/pg_hba.conf",
- require => Exec["pginitdb"] }
- postgres::user{"dcloud":
- password => "v23zj59an",
- roles => "CREATEDB",
- require => Service["postgresql"]}
-
-
- # Create aeolus database
- rails::create::db{"create_aeolus_database":
- cwd => "/usr/share/deltacloud-aggregator",
- rails_env => "production",
- require => [Postgres::User[dcloud],
Package['deltacloud-aggregator']]}
- rails::migrate::db{"migrate_aeolus_database":
- cwd => "/usr/share/deltacloud-aggregator",
- rails_env => "production",
- require => Rails::Create::Db[create_aeolus_database]}
-}
-
-class aeolus::aggregator::disabled {
- ### Uninstall the aeolus components
- package {['deltacloud-aggregator-daemons',
- 'deltacloud-aggregator-doc']:
- provider => 'yum', ensure => 'absent',
- require => Service['deltacloud-aggregator',
- 'deltacloud-condor_refreshd',
- 'deltacloud-dbomatic',
- 'imagefactoryd',
- 'deltacloud-image_builder_service']}
-
- package {'deltacloud-aggregator':
- provider => 'yum', ensure => 'absent',
- require => [Package['deltacloud-aggregator-daemons',
- 'deltacloud-aggregator-doc'],
- Rails::Drop::Db["drop_aeolus_database"]] }
-
- package { 'rubygem-deltacloud-client':
- provider => 'yum', ensure => 'absent',
- require => Package['deltacloud-aggregator']}
-
- ### Stop the deltacloud services
- service { ['condor', 'httpd']:
- ensure => 'stopped',
- enable => false,
- require => Service['deltacloud-aggregator',
- 'deltacloud-condor_refreshd',
- 'deltacloud-dbomatic'] }
- service { ['deltacloud-aggregator',
- 'deltacloud-condor_refreshd',
- 'deltacloud-dbomatic']:
- ensure => 'stopped',
- enable => false,
- hasstatus => true }
-
- ### Destroy the aeolus database
- rails::drop::db{"drop_aeolus_database":
- cwd => "/usr/share/deltacloud-aggregator",
- rails_env => "production",
- require => Service["deltacloud-aggregator",
- "deltacloud-condor_refreshd",
- "deltacloud-dbomatic",
- "deltacloud-image_builder_service"]}
- postgres::user{"dcloud":
- ensure => 'dropped',
- require => Rails::Drop::Db["drop_aeolus_database"]}
-}
-
-# Create a new site admin aggregator web user
-define aeolus::site_admin($email="", $password="",
$first_name="", $last_name=""){
- exec{"create_site_admin_user":
- cwd => '/usr/share/deltacloud-aggregator',
- environment => "RAILS_ENV=production",
- command => "/usr/bin/rake dc:create_user[${name}] email=${email}
password=${password} first_name=${first_name} last_name=${last_name}",
- unless => "/usr/bin/test `psql dcloud dcloud -P tuples_only -c
\"select count(*) from users where login = '${name}';\"` =
\"1\"",
- require => Rails::Migrate::Db["migrate_aeolus_database"]}
- exec{"grant_site_admin_privs":
- cwd => '/usr/share/deltacloud-aggregator',
- environment => "RAILS_ENV=production",
- command => "/usr/bin/rake dc:site_admin[${name}]",
- unless => "/usr/bin/test `psql dcloud dcloud -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]}
-}
-
diff --git a/recipes/aeolus_recipe/manifests/conductor.pp
b/recipes/aeolus_recipe/manifests/conductor.pp
new file mode 100644
index 0000000..b3fac83
--- /dev/null
+++ b/recipes/aeolus_recipe/manifests/conductor.pp
@@ -0,0 +1,128 @@
+# Aeolus conductor puppet definitions
+
+class aeolus::conductor inherits aeolus {
+ ### Install the aeolus components
+ # specific versions of these two packages are needed and we need to pull the third
in
+ package { 'rubygem-deltacloud-client':
+ provider => 'yum', ensure => 'installed', require
=> Yumrepo['aeolus_arch', 'aeolus_noarch'] }
+
+ package {['deltacloud-aggregator',
+ 'deltacloud-aggregator-daemons',
+ 'deltacloud-aggregator-doc']:
+ provider => 'yum', ensure => 'installed',
+ require => Package['rubygem-deltacloud-client',
+ 'rubygem-deltacloud-image-builder-agent',
+ 'iwhd']}
+
+ ### Setup selinux for aeolus
+ selinux::mode{"permissive":}
+
+ ### Setup firewall for aeolus
+ firewall::rule{"http": destination_port => '80'}
+
+ ### Start the aeolus services
+ file {"/var/lib/condor/condor_config.local":
+ source => "puppet:///modules/aeolus_recipe/condor_config.local",
+ require => Package['deltacloud-aggregator-daemons'] }
+ service { ['condor', 'httpd']:
+ ensure => 'running',
+ enable => true,
+ require => File['/var/lib/condor/condor_config.local'] }
+ service { ['deltacloud-aggregator',
+ 'deltacloud-condor_refreshd',
+ 'deltacloud-dbomatic']:
+ ensure => 'running',
+ enable => true,
+ hasstatus => true,
+ require => [Package['deltacloud-aggregator-daemons'],
+ Rails::Migrate::Db[migrate_aeolus_database],
+ Service[condor]] }
+
+ ### Initialize and start the aeolus database
+ # Right now we configure and start postgres, at some point I want
+ # to make the db that gets setup configurable
+ include postgres::server
+ file { "/var/lib/pgsql/data/pg_hba.conf":
+ source => "puppet:///modules/aeolus_recipe/pg_hba.conf",
+ require => Exec["pginitdb"] }
+ postgres::user{"dcloud":
+ password => "v23zj59an",
+ roles => "CREATEDB",
+ require => Service["postgresql"]}
+
+
+ # Create aeolus database
+ rails::create::db{"create_aeolus_database":
+ cwd => "/usr/share/deltacloud-aggregator",
+ rails_env => "production",
+ require => [Postgres::User[dcloud],
Package['deltacloud-aggregator']]}
+ rails::migrate::db{"migrate_aeolus_database":
+ cwd => "/usr/share/deltacloud-aggregator",
+ rails_env => "production",
+ require => Rails::Create::Db[create_aeolus_database]}
+}
+
+class aeolus::conductor::disabled {
+ ### Uninstall the aeolus components
+ package {['deltacloud-aggregator-daemons',
+ 'deltacloud-aggregator-doc']:
+ provider => 'yum', ensure => 'absent',
+ require => Service['deltacloud-aggregator',
+ 'deltacloud-condor_refreshd',
+ 'deltacloud-dbomatic',
+ 'imagefactoryd',
+ 'deltacloud-image_builder_service']}
+
+ package {'deltacloud-aggregator':
+ provider => 'yum', ensure => 'absent',
+ require => [Package['deltacloud-aggregator-daemons',
+ 'deltacloud-aggregator-doc'],
+ Rails::Drop::Db["drop_aeolus_database"]] }
+
+ package { 'rubygem-deltacloud-client':
+ provider => 'yum', ensure => 'absent',
+ require => Package['deltacloud-aggregator']}
+
+ ### Stop the deltacloud services
+ service { ['condor', 'httpd']:
+ ensure => 'stopped',
+ enable => false,
+ require => Service['deltacloud-aggregator',
+ 'deltacloud-condor_refreshd',
+ 'deltacloud-dbomatic'] }
+ service { ['deltacloud-aggregator',
+ 'deltacloud-condor_refreshd',
+ 'deltacloud-dbomatic']:
+ ensure => 'stopped',
+ enable => false,
+ hasstatus => true }
+
+ ### Destroy the aeolus database
+ rails::drop::db{"drop_aeolus_database":
+ cwd => "/usr/share/deltacloud-aggregator",
+ rails_env => "production",
+ require => Service["deltacloud-aggregator",
+ "deltacloud-condor_refreshd",
+ "deltacloud-dbomatic",
+ "deltacloud-image_builder_service"]}
+ postgres::user{"dcloud":
+ ensure => 'dropped',
+ require => Rails::Drop::Db["drop_aeolus_database"]}
+}
+
+# Create a new site admin conductor web user
+define aeolus::site_admin($email="", $password="",
$first_name="", $last_name=""){
+ exec{"create_site_admin_user":
+ cwd => '/usr/share/deltacloud-aggregator',
+ environment => "RAILS_ENV=production",
+ command => "/usr/bin/rake dc:create_user[${name}] email=${email}
password=${password} first_name=${first_name} last_name=${last_name}",
+ unless => "/usr/bin/test `psql dcloud dcloud -P tuples_only -c
\"select count(*) from users where login = '${name}';\"` =
\"1\"",
+ require => Rails::Migrate::Db["migrate_aeolus_database"]}
+ exec{"grant_site_admin_privs":
+ cwd => '/usr/share/deltacloud-aggregator',
+ environment => "RAILS_ENV=production",
+ command => "/usr/bin/rake dc:site_admin[${name}]",
+ unless => "/usr/bin/test `psql dcloud dcloud -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]}
+}
+
--
1.7.3.5