[PATCH configure 3/4] rename 'core' to 'deltacloud'

From: Mohammed Morsi <mmorsi(a)redhat.com&gt; Signed-off-by: Chris Lalancette <clalance(a)redhat.com&gt; --- recipes/aeolus_recipe/aeolus_recipe.pp | 2 +- recipes/aeolus_recipe/aeolus_uninstall.pp | 2 +- recipes/aeolus_recipe/files/condor_config.local | 2 +- recipes/aeolus_recipe/manifests/aeolus.pp | 2 +- recipes/aeolus_recipe/manifests/conductor.pp | 78 ++++++++++---------- recipes/aeolus_recipe/manifests/core.pp | 35 --------- recipes/aeolus_recipe/manifests/deltacloud.pp | 35 +++++++++ recipes/aeolus_recipe/manifests/image-factory.pp | 12 ++-- recipes/aeolus_recipe/manifests/iwhd.pp | 2 +- .../firewall/files/chain_rules/filter/INPUT.head | 1 - 10 files changed, 85 insertions(+), 86 deletions(-) delete mode 100644 recipes/aeolus_recipe/manifests/core.pp create mode 100644 recipes/aeolus_recipe/manifests/deltacloud.pp diff --git a/recipes/aeolus_recipe/aeolus_recipe.pp b/recipes/aeolus_recipe/aeolus_recipe.pp index af6a6ac..65ae86f 100644 --- a/recipes/aeolus_recipe/aeolus_recipe.pp +++ b/recipes/aeolus_recipe/aeolus_recipe.pp @@ -27,7 +27,7 @@ import "aeolus_recipe/aeolus" # include the various aeolus components include aeolus::conductor -include aeolus::core +include aeolus::deltacloud include aeolus::image-factory include aeolus::iwhd diff --git a/recipes/aeolus_recipe/aeolus_uninstall.pp b/recipes/aeolus_recipe/aeolus_uninstall.pp index c1b02c4..4399ac3 100644 --- a/recipes/aeolus_recipe/aeolus_uninstall.pp +++ b/recipes/aeolus_recipe/aeolus_uninstall.pp @@ -27,6 +27,6 @@ import "aeolus_recipe/aeolus" # disable the various aeolus components include aeolus::conductor::disabled -include aeolus::core::disabled +include aeolus::deltacloud::disabled include aeolus::iwhd::disabled include aeolus::image-factory::disabled diff --git a/recipes/aeolus_recipe/files/condor_config.local b/recipes/aeolus_recipe/files/condor_config.local index d9d50c5..0a4b27e 100644 --- a/recipes/aeolus_recipe/files/condor_config.local +++ b/recipes/aeolus_recipe/files/condor_config.local @@ -23,4 +23,4 @@ EVENT_LOG=$(LOG)/EventLog EVENT_LOG_USE_XML=True EVENT_LOG_JOB_AD_INFORMATION_ATTRS=Owner,GlobalJobId,Cmd,JobStartDate,JobCurrentStartDate,JobFinishedHookDone -CLASSAD_USER_LIBS = /usr/share/deltacloud-aggregator/classad_plugin/deltacloud_classad_plugin.so +CLASSAD_USER_LIBS = /usr/share/aeolus-conductor/classad_plugin/conductor_classad_plugin.so diff --git a/recipes/aeolus_recipe/manifests/aeolus.pp b/recipes/aeolus_recipe/manifests/aeolus.pp index f4242d1..da67c9b 100644 --- a/recipes/aeolus_recipe/manifests/aeolus.pp +++ b/recipes/aeolus_recipe/manifests/aeolus.pp @@ -8,7 +8,7 @@ import "selinux" import "ntp" import "conductor" -import "core" +import "deltacloud" import "iwhd" import "image-factory" diff --git a/recipes/aeolus_recipe/manifests/conductor.pp b/recipes/aeolus_recipe/manifests/conductor.pp index b3fac83..3ef4a0a 100644 --- a/recipes/aeolus_recipe/manifests/conductor.pp +++ b/recipes/aeolus_recipe/manifests/conductor.pp @@ -6,9 +6,9 @@ class aeolus::conductor inherits aeolus { package { 'rubygem-deltacloud-client': provider => 'yum', ensure => 'installed', require => Yumrepo['aeolus_arch', 'aeolus_noarch'] } - package {['deltacloud-aggregator', - 'deltacloud-aggregator-daemons', - 'deltacloud-aggregator-doc']: + package {['aeolus-conductor', + 'aeolus-conductor-daemons', + 'aeolus-conductor-doc']: provider => 'yum', ensure => 'installed', require => Package['rubygem-deltacloud-client', 'rubygem-deltacloud-image-builder-agent', @@ -23,18 +23,18 @@ 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 => Package['deltacloud-aggregator-daemons'] } + require => Package['aeolus-conductor-daemons'] } service { ['condor', 'httpd']: ensure => 'running', enable => true, require => File['/var/lib/condor/condor_config.local'] } - service { ['deltacloud-aggregator', - 'deltacloud-condor_refreshd', - 'deltacloud-dbomatic']: + service { ['aeolus-conductor', + 'conductor-condor_refreshd', + 'conductor-dbomatic']: ensure => 'running', enable => true, hasstatus => true, - require => [Package['deltacloud-aggregator-daemons'], + require => [Package['aeolus-conductor-daemons'], Rails::Migrate::Db[migrate_aeolus_database], Service[condor]] } @@ -45,7 +45,7 @@ class aeolus::conductor inherits aeolus { file { "/var/lib/pgsql/data/pg_hba.conf": source => "puppet:///modules/aeolus_recipe/pg_hba.conf", require => Exec["pginitdb"] } - postgres::user{"dcloud": + postgres::user{"aeolus": password => "v23zj59an", roles => "CREATEDB", require => Service["postgresql"]} @@ -53,59 +53,59 @@ class aeolus::conductor inherits aeolus { # Create aeolus database rails::create::db{"create_aeolus_database": - cwd => "/usr/share/deltacloud-aggregator", + cwd => "/usr/share/aeolus-conductor", rails_env => "production", - require => [Postgres::User[dcloud], Package['deltacloud-aggregator']]} + require => [Postgres::User[aeolus], Package['aeolus-conductor']]} rails::migrate::db{"migrate_aeolus_database": - cwd => "/usr/share/deltacloud-aggregator", + cwd => "/usr/share/aeolus-conductor", 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']: + package {['aeolus-conductor-daemons', + 'aeolus-conductor-doc']: provider => 'yum', ensure => 'absent', - require => Service['deltacloud-aggregator', - 'deltacloud-condor_refreshd', - 'deltacloud-dbomatic', + require => Service['aeolus-conductor', + 'conductor-condor_refreshd', + 'conductor-dbomatic', 'imagefactoryd', - 'deltacloud-image_builder_service']} + 'conductor-image_builder_service']} - package {'deltacloud-aggregator': + package {'aeolus-conductor': provider => 'yum', ensure => 'absent', - require => [Package['deltacloud-aggregator-daemons', - 'deltacloud-aggregator-doc'], + require => [Package['aeolus-conductor-daemons', + 'aeolus-conductor-doc'], Rails::Drop::Db["drop_aeolus_database"]] } package { 'rubygem-deltacloud-client': provider => 'yum', ensure => 'absent', - require => Package['deltacloud-aggregator']} + require => Package['aeolus-conductor']} - ### Stop the deltacloud services + ### Stop the aeolus 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']: + require => Service['aeolus-conductor', + 'conductor-condor_refreshd', + 'conductor-dbomatic'] } + service { ['aeolus-conductor', + 'conductor-condor_refreshd', + 'conductor-dbomatic']: ensure => 'stopped', enable => false, hasstatus => true } ### Destroy the aeolus database rails::drop::db{"drop_aeolus_database": - cwd => "/usr/share/deltacloud-aggregator", + cwd => "/usr/share/aeolus-conductor", rails_env => "production", - require => Service["deltacloud-aggregator", - "deltacloud-condor_refreshd", - "deltacloud-dbomatic", - "deltacloud-image_builder_service"]} - postgres::user{"dcloud": + require => Service["aeolus-conductor", + "conductor-condor_refreshd", + "conductor-dbomatic", + "conductor-image_builder_service"]} + postgres::user{"aeolus": ensure => 'dropped', require => Rails::Drop::Db["drop_aeolus_database"]} } @@ -113,16 +113,16 @@ class aeolus::conductor::disabled { # 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', + cwd => '/usr/share/aeolus-conductor', 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\"", + unless => "/usr/bin/test `psql aeolus aeolus -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', + cwd => '/usr/share/aeolus-conductor', 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\"", + 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\"", require => Exec[create_site_admin_user]} } diff --git a/recipes/aeolus_recipe/manifests/core.pp b/recipes/aeolus_recipe/manifests/core.pp deleted file mode 100644 index 62fb784..0000000 --- a/recipes/aeolus_recipe/manifests/core.pp +++ /dev/null @@ -1,35 +0,0 @@ -# Aeolus core puppet definitions - -class aeolus::core inherits aeolus { - ### Install the aeolus components - package { 'rubygem-deltacloud-core': - provider => 'yum', ensure => 'installed', require => Yumrepo['aeolus_arch', 'aeolus_noarch']} - file { "/var/log/deltacloud-core": ensure => 'directory' } - - ### we need to sync time to communicate w/ cloud providers - include ntp::client - - ### Start the aeolus services - file {"/etc/init.d/deltacloud-core": - source => "puppet:///modules/aeolus_recipe/deltacloud-core", - mode => 755 } - service { 'deltacloud-core': - ensure => 'running', - enable => true, - require => [Package['rubygem-deltacloud-core'], - File['/etc/init.d/deltacloud-core']] } -} - -class aeolus::core::disabled { - ### Uninstall the aeolus components - package { 'rubygem-deltacloud-core': - provider => 'yum', ensure => 'absent', - require => Service['deltacloud-core']} - - ### Stop the aeolus services - service { 'deltacloud-core': - ensure => 'stopped', - enable => false, - hasstatus => true} -} - diff --git a/recipes/aeolus_recipe/manifests/deltacloud.pp b/recipes/aeolus_recipe/manifests/deltacloud.pp new file mode 100644 index 0000000..3803561 --- /dev/null +++ b/recipes/aeolus_recipe/manifests/deltacloud.pp @@ -0,0 +1,35 @@ +# Aeolus deltacloud puppet definitions + +class aeolus::deltacloud inherits aeolus { + ### Install the aeolus components + package { 'rubygem-deltacloud-core': + provider => 'yum', ensure => 'installed', require => Yumrepo['aeolus_arch', 'aeolus_noarch']} + file { "/var/log/deltacloud-core": ensure => 'directory' } + + ### we need to sync time to communicate w/ cloud providers + include ntp::client + + ### Start the aeolus services + file {"/etc/init.d/deltacloud-core": + source => "puppet:///modules/aeolus_recipe/deltacloud-core", + mode => 755 } + service { 'deltacloud-core': + ensure => 'running', + enable => true, + require => [Package['rubygem-deltacloud-core'], + File['/etc/init.d/deltacloud-core']] } +} + +class aeolus::deltacloud::disabled { + ### Uninstall the aeolus components + package { 'rubygem-deltacloud-core': + provider => 'yum', ensure => 'absent', + require => Service['deltacloud-core']} + + ### Stop the aeolus services + service { 'deltacloud-core': + ensure => 'stopped', + enable => false, + hasstatus => true} +} + diff --git a/recipes/aeolus_recipe/manifests/image-factory.pp b/recipes/aeolus_recipe/manifests/image-factory.pp index d3706a0..a01afaf 100644 --- a/recipes/aeolus_recipe/manifests/image-factory.pp +++ b/recipes/aeolus_recipe/manifests/image-factory.pp @@ -49,12 +49,12 @@ class aeolus::image-factory inherits aeolus { ensure => 'running', enable => true, require => [File['/etc/qpidd.conf'], - Package['deltacloud-aggregator-daemons']]} + Package['aeolus-conductor-daemons']]} file { "/etc/imagefactory.yml": source => "puppet:///modules/aeolus_recipe/imagefactory.yml", mode => 644 } $requires = [Package['rubygem-deltacloud-image-builder-agent'], - Package['deltacloud-aggregator-daemons'], + Package['aeolus-conductor-daemons'], File['/etc/imagefactory.yml'], Service[qpidd], Rails::Migrate::Db[migrate_aeolus_database], @@ -63,7 +63,7 @@ class aeolus::image-factory inherits aeolus { ensure => 'running', enable => true, require => $requires} - service { 'deltacloud-image_builder_service': + service { 'conductor-image_builder_service': ensure => 'running', enable => true, hasstatus => true, @@ -75,13 +75,13 @@ class aeolus::image-factory::disabled { service {'qpidd': ensure => 'stopped', enable => false, - require => Service['imagefactoryd', 'deltacloud-image_builder_service']} + require => Service['imagefactoryd', 'conductor-image_builder_service']} service { 'imagefactoryd': ensure => 'stopped', enable => false} - service { 'deltacloud-image_builder_service': + service { 'conductor-image_builder_service': ensure => 'stopped', hasstatus => true, enable => false} @@ -90,7 +90,7 @@ class aeolus::image-factory::disabled { ### Uninstall the aeolus components package { 'rubygem-deltacloud-image-builder-agent': provider => 'yum', ensure => 'absent', - require => Package['deltacloud-aggregator']} + require => Package['aeolus-conductor']} # FIXME these lingering dependencies, pulled in for # rubygem-deltacloud-image-builder-agent, need to be removed as diff --git a/recipes/aeolus_recipe/manifests/iwhd.pp b/recipes/aeolus_recipe/manifests/iwhd.pp index 1c9ab59..1517734 100644 --- a/recipes/aeolus_recipe/manifests/iwhd.pp +++ b/recipes/aeolus_recipe/manifests/iwhd.pp @@ -54,7 +54,7 @@ class aeolus::iwhd::disabled { ### Uninstall the aeolus components package { 'iwhd': provider => 'yum', ensure => 'absent', - require => [Package['deltacloud-aggregator'], Service['iwhd']]} + require => [Package['aeolus-conductor'], Service['iwhd']]} } # Create a named bucket in iwhd diff --git a/recipes/firewall/files/chain_rules/filter/INPUT.head b/recipes/firewall/files/chain_rules/filter/INPUT.head index e12264a..c3c376a 100644 --- a/recipes/firewall/files/chain_rules/filter/INPUT.head +++ b/recipes/firewall/files/chain_rules/filter/INPUT.head @@ -1,5 +1,4 @@ # INPUT.head --P INPUT DROP #-i lo -m comment --comment "localhost access" -j ACCEPT -i lo -j ACCEPT #-m state --state RELATED,ESTABLISHED -m comment --comment "All established/related" -j ACCEPT -- 1.7.3.5