[PATCH] Added delayed_job service
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
---
recipes/deltacloud_recipe/manifests/aggregator.pp | 24 ++++++++++++++++++++-
1 files changed, 23 insertions(+), 1 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/aggregator.pp b/recipes/deltacloud_recipe/manifests/aggregator.pp
index 8ffe3ea..4ea56bf 100644
--- a/recipes/deltacloud_recipe/manifests/aggregator.pp
+++ b/recipes/deltacloud_recipe/manifests/aggregator.pp
@@ -93,7 +93,7 @@ class deltacloud::aggregator inherits deltacloud {
rails::migrate::db{"migrate_deltacloud_database":
cwd => "/usr/share/deltacloud-aggregator",
rails_env => "production",
- require => [Rails::Create::Db[create_deltacloud_database], Service['solr']]}
+ require => [Rails::Create::Db[create_deltacloud_database], Service['solr'], Service['delayed_job']]}
rails::seed::db{"seed_deltacloud_database":
cwd => "/usr/share/deltacloud-aggregator",
rails_env => "production",
@@ -122,6 +122,17 @@ class deltacloud::aggregator inherits deltacloud {
} else{
apache::site{"deltacloud-aggregator": source => 'puppet:///modules/deltacloud_recipe/aggregator-httpd.conf'}
}
+
+ ### Start delayed_job service
+ service{"delayed_job":
+ start => "RAILS_ENV=production /usr/share/deltacloud-aggregator/script/delayed_job start",
+ stop => "RAILS_ENV=production /usr/share/deltacloud-aggregator/script/delayed_job stop",
+ hasstatus => "false",
+ pattern => "delayed_job",
+ ensure => 'running',
+ require => [Package['deltacloud-aggregator'], Rails::Create::Db['create_deltacloud_database']]}
+
+
}
class deltacloud::aggregator::disabled {
@@ -141,6 +152,7 @@ class deltacloud::aggregator::disabled {
require => [Package['deltacloud-aggregator-daemons',
'deltacloud-aggregator-doc'],
Service['solr'],
+ Service['delayed_job'],
Rails::Drop::Db["drop_deltacloud_database"]] }
}
@@ -188,6 +200,16 @@ class deltacloud::aggregator::disabled {
pattern => "solr",
ensure => 'stopped',
require => Service['deltacloud-aggregator']}
+
+ ### stop delayed_job service
+ service{"delayed_job":
+ stop => "RAILS_ENV=production /usr/share/deltacloud-aggregator/script/delayed_job stop",
+ hasstatus => "false",
+ pattern => "delayed_job",
+ ensure => 'running',
+ require => [Package['deltacloud-aggregator']]}
+
+
}
# Create a new site admin aggregator web user
--
1.7.3.5
13 years, 1 month
[PATCH conductor] Remove leftover debug code
by Tomas Sedovic
From: Tomas Sedovic <tsedovic(a)redhat.com>
---
.../provider_accounts_controller_spec.rb | 1 -
1 files changed, 0 insertions(+), 1 deletions(-)
diff --git a/src/spec/controllers/provider_accounts_controller_spec.rb b/src/spec/controllers/provider_accounts_controller_spec.rb
index abc7844..567538b 100644
--- a/src/spec/controllers/provider_accounts_controller_spec.rb
+++ b/src/spec/controllers/provider_accounts_controller_spec.rb
@@ -23,7 +23,6 @@ describe Admin::ProviderAccountsController do
it "allows test account validity on create when passing test_account param" do
UserSession.create(@admin)
- require 'ruby-debug'
post :create, :provider_account => {:provider_id => @provider.id}, :test_account => true
response.should be_success
response.should render_template("new")
--
1.7.4
13 years, 1 month
(no subject)
by jzigmund@redhat.com
>From jzigmund(a)redhat.com # This line is ignored.
From: jzigmund(a)redhat.com
Subject:
In-Reply-To:
13 years, 1 month
[PATCH conductor] Added dependency on net-scp and delayed_job into rpm spec
by Jan Provazník
From: Jan Provaznik <jprovazn(a)redhat.com>
---
deltacloud-aggregator.spec.in | 2 ++
1 files changed, 2 insertions(+), 0 deletions(-)
diff --git a/deltacloud-aggregator.spec.in b/deltacloud-aggregator.spec.in
index 0632f79..3272475 100644
--- a/deltacloud-aggregator.spec.in
+++ b/deltacloud-aggregator.spec.in
@@ -33,6 +33,8 @@ Requires: rubygem(deltacloud-image-builder-agent)
Requires: rubygem(imagebuilder-console)
Requires: rubygem(rack-restful_submit)
Requires: rubygem(sunspot_rails)
+Requires: rubygem(delayed_job)
+Requires: rubygem(net-scp)
Requires: postgresql
Requires: postgresql-server
Requires: ruby-postgres
--
1.7.3.5
13 years, 1 month
[PATCH configure 1/1] Implement a simple service wrapper around solr invocation
by Mike Orazi
This allows solr to be controlled through chkconfig so that it
can restart on reboot.
---
recipes/deltacloud_recipe/files/solr.conf | 3 +
recipes/deltacloud_recipe/files/solr.init | 75 +++++++++++++++++++++
recipes/deltacloud_recipe/manifests/aggregator.pp | 18 ++++-
3 files changed, 92 insertions(+), 4 deletions(-)
create mode 100644 recipes/deltacloud_recipe/files/solr.conf
create mode 100644 recipes/deltacloud_recipe/files/solr.init
diff --git a/recipes/deltacloud_recipe/files/solr.conf b/recipes/deltacloud_recipe/files/solr.conf
new file mode 100644
index 0000000..3830292
--- /dev/null
+++ b/recipes/deltacloud_recipe/files/solr.conf
@@ -0,0 +1,3 @@
+#Provide a spot for overrides
+#RAILS_ENV=production
+
diff --git a/recipes/deltacloud_recipe/files/solr.init b/recipes/deltacloud_recipe/files/solr.init
new file mode 100644
index 0000000..9a6b4f2
--- /dev/null
+++ b/recipes/deltacloud_recipe/files/solr.init
@@ -0,0 +1,75 @@
+#!/bin/bash
+#
+#
+# solr startup script for solr server
+#
+# chkconfig: - 40 60
+# description: solr is primary server process for the \
+# solr component.
+#
+
+[ -r /etc/sysconfig/solr ] && . /etc/sysconfig/solr
+
+LOCKFILE="${LOCKFILE:-/var/lock/subsys/solr}"
+RAILS_ENV="${RAILS_ENV:-production}"
+
+PROG=/usr/bin/rake
+
+. /etc/init.d/functions
+
+start() {
+ echo -n "Starting solr: "
+
+ cd /usr/share/deltacloud-aggregator; RAILS_ENV=$RAILS_ENV $PROG sunspot:solr:start
+ RETVAL=$?
+ if [ $RETVAL -eq 0 ] && touch $LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
+}
+
+stop() {
+ echo -n "Shutting down solr: "
+ RETVAL=$?
+ cd /usr/share/deltacloud-aggregator; RAILS_ENV=$RAILS_ENV $PROG sunspot:solr:stop
+
+ if [ $RETVAL -eq 0 ] && rm -f $LOCKFILE ; then
+ echo_success
+ echo
+ else
+ echo_failure
+ echo
+ fi
+}
+
+case "$1" in
+ start)
+ start
+ ;;
+ stop)
+ stop
+ ;;
+ restart)
+ stop
+ start
+ ;;
+ reload)
+ ;;
+ force-reload)
+ restart
+ ;;
+ status)
+ status $PROG
+ RETVAL=$?
+ ;;
+ *)
+ echo "Usage: solr {start|stop|restart|status}"
+ exit 1
+ ;;
+esac
+
+exit $RETVAL
+
diff --git a/recipes/deltacloud_recipe/manifests/aggregator.pp b/recipes/deltacloud_recipe/manifests/aggregator.pp
index 8ffe3ea..3b61dc5 100644
--- a/recipes/deltacloud_recipe/manifests/aggregator.pp
+++ b/recipes/deltacloud_recipe/manifests/aggregator.pp
@@ -101,13 +101,23 @@ class deltacloud::aggregator inherits deltacloud {
### Setup/start solr search service
+ file{"/etc/init.d/solr":
+ source => 'puppet:///modules/deltacloud_recipe/solr.init',
+ mode => 755
+ }
+
+ file{"/etc/sysconfig/solr":
+ source => 'puppet:///modules/deltacloud_recipe/solr.conf',
+ mode => 755
+ }
service{"solr":
- start => "cd /usr/share/deltacloud-aggregator; RAILS_ENV=production /usr/bin/rake sunspot:solr:start",
- stop => "cd /usr/share/deltacloud-aggregator; RAILS_ENV=production /usr/bin/rake sunspot:solr:stop",
hasstatus => "false",
- pattern => "solr",
+ pattern => "jetty.port=8983",
ensure => 'running',
- require => [return_if($enable_packages, Package['deltacloud-aggregator']), Rails::Create::Db['create_deltacloud_database']]}
+ enable => 'true',
+ require => [File['/etc/init.d/solr', '/etc/init.d/solr'],
+ return_if($enable_packages, Package['deltacloud-aggregator']),
+ Rails::Create::Db['create_deltacloud_database']]}
exec{"build_solr_index":
cwd => "/usr/share/deltacloud-aggregator",
--
1.7.4
13 years, 1 month
[PATCH 2/4] Rename cloud_account to provider_account for consistency.
by Ian Main
This patch just renames the classad variables to keep things more
consistent. No real functional change here.
Signed-off-by: Ian Main <imain(a)redhat.com>
---
src/app/util/condormatic.rb | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/app/util/condormatic.rb b/src/app/util/condormatic.rb
index 23aafef..613430b 100644
--- a/src/app/util/condormatic.rb
+++ b/src/app/util/condormatic.rb
@@ -67,7 +67,7 @@ def condormatic_instance_create(task)
# Call into the deltacloud quota plugin. This uses a REST API to call back into the
# conductor to check quotas as the last thing in the logical AND to match a provider
# account.
- requirements += " && deltacloud_quota_check(#{instance.id}, other.cloud_account_id)"
+ requirements += " && deltacloud_quota_check(#{instance.id}, other.provider_account_id)"
requirements += "\n"
pipe.puts requirements
@@ -249,7 +249,7 @@ def condormatic_classads_sync
pipe.puts "provider_url=\"#{account.provider.url}\""
pipe.puts "username=\"#{account.username}\""
pipe.puts "password=\"#{account.password}\""
- pipe.puts "cloud_account_id=\"#{account.id}\""
+ pipe.puts "provider_account_id=\"#{account.id}\""
pipe.puts "keypair=\"#{escape(account.instance_key.name)}\""
pipe.close_write
--
1.7.4
13 years, 1 month
[PATCH configure] add flag toggling package installation / removal
by Mo Morsi
Sets the default settings to ensure packages exist in deltacloud-configure
but leave installed packages as is in deltacloud-cleanup
---
bin/deltacloud-cleanup | 1 +
bin/deltacloud-configure | 1 +
.../lib/puppet/parser/functions/return_if.rb | 7 ++
recipes/deltacloud_recipe/manifests/aggregator.pp | 70 ++++++++-------
recipes/deltacloud_recipe/manifests/core.pp | 16 ++--
recipes/deltacloud_recipe/manifests/deltacloud.pp | 5 +
.../deltacloud_recipe/manifests/image-factory.pp | 92 ++++++++++---------
recipes/deltacloud_recipe/manifests/iwhd.pp | 23 +++--
8 files changed, 123 insertions(+), 92 deletions(-)
create mode 100644 recipes/deltacloud_recipe/lib/puppet/parser/functions/return_if.rb
diff --git a/bin/deltacloud-cleanup b/bin/deltacloud-cleanup
index a988f52..5cd1e75 100755
--- a/bin/deltacloud-cleanup
+++ b/bin/deltacloud-cleanup
@@ -1,5 +1,6 @@
#!/bin/sh
export FACTER_DELTACLOUD_ENABLE_SECURITY=true
+export FACTER_AEOLUS_ENABLE_PACKAGES=false
puppet /usr/share/deltacloud-configure/deltacloud_uninstall.pp \
--modulepath=/usr/share/deltacloud-configure/modules/
diff --git a/bin/deltacloud-configure b/bin/deltacloud-configure
index bfd340e..b8ca3fc 100755
--- a/bin/deltacloud-configure
+++ b/bin/deltacloud-configure
@@ -1,5 +1,6 @@
#!/bin/sh
export FACTER_DELTACLOUD_ENABLE_SECURITY=true
+export FACTER_AEOLUS_ENABLE_PACKAGES=true
puppet /usr/share/deltacloud-configure/deltacloud_recipe.pp \
--modulepath=/usr/share/deltacloud-configure/modules/
diff --git a/recipes/deltacloud_recipe/lib/puppet/parser/functions/return_if.rb b/recipes/deltacloud_recipe/lib/puppet/parser/functions/return_if.rb
new file mode 100644
index 0000000..0e943ea
--- /dev/null
+++ b/recipes/deltacloud_recipe/lib/puppet/parser/functions/return_if.rb
@@ -0,0 +1,7 @@
+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/deltacloud_recipe/manifests/aggregator.pp b/recipes/deltacloud_recipe/manifests/aggregator.pp
index f2bcc8f..8ffe3ea 100644
--- a/recipes/deltacloud_recipe/manifests/aggregator.pp
+++ b/recipes/deltacloud_recipe/manifests/aggregator.pp
@@ -3,16 +3,18 @@
class deltacloud::aggregator inherits deltacloud {
### Install the deltacloud 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['deltacloud_arch', 'deltacloud_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']}
+ if $enable_packages {
+ package { 'rubygem-deltacloud-client':
+ provider => 'yum', ensure => 'installed', require => Yumrepo['deltacloud_arch', 'deltacloud_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']}
+ }
file {"/var/lib/deltacloud-aggregator":
ensure => directory,
@@ -27,7 +29,7 @@ class deltacloud::aggregator inherits deltacloud {
### Start the deltacloud services
file {"/var/lib/condor/condor_config.local":
source => "puppet:///modules/deltacloud_recipe/condor_config.local",
- require => Package['deltacloud-aggregator-daemons'] }
+ require => return_if($enable_packages, Package['deltacloud-aggregator-daemons']) }
service { 'condor':
ensure => 'running',
enable => true,
@@ -38,7 +40,7 @@ class deltacloud::aggregator inherits deltacloud {
ensure => 'running',
enable => true,
hasstatus => true,
- require => [Package['deltacloud-aggregator-daemons'],
+ require => [return_if($enable_packages, Package['deltacloud-aggregator-daemons']),
Rails::Seed::Db[seed_deltacloud_database],
Service[condor]] }
@@ -87,7 +89,7 @@ class deltacloud::aggregator inherits deltacloud {
rails::create::db{"create_deltacloud_database":
cwd => "/usr/share/deltacloud-aggregator",
rails_env => "production",
- require => [Postgres::User[dcloud], Package['deltacloud-aggregator']]}
+ require => [Postgres::User[dcloud], return_if($enable_packages, Package['deltacloud-aggregator'])] }
rails::migrate::db{"migrate_deltacloud_database":
cwd => "/usr/share/deltacloud-aggregator",
rails_env => "production",
@@ -105,7 +107,7 @@ class deltacloud::aggregator inherits deltacloud {
hasstatus => "false",
pattern => "solr",
ensure => 'running',
- require => [Package['deltacloud-aggregator'], Rails::Create::Db['create_deltacloud_database']]}
+ require => [return_if($enable_packages, Package['deltacloud-aggregator']), Rails::Create::Db['create_deltacloud_database']]}
exec{"build_solr_index":
cwd => "/usr/share/deltacloud-aggregator",
@@ -124,30 +126,34 @@ class deltacloud::aggregator inherits deltacloud {
class deltacloud::aggregator::disabled {
### Uninstall the deltacloud 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'],
- Service['solr'],
- Rails::Drop::Db["drop_deltacloud_database"]] }
+ if $enable_packages {
+ 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'],
+ Service['solr'],
+ Rails::Drop::Db["drop_deltacloud_database"]] }
+ }
file {"/var/lib/deltacloud-aggregator":
ensure => absent,
force => true
}
- package { 'rubygem-deltacloud-client':
- provider => 'yum', ensure => 'absent',
- require => Package['deltacloud-aggregator']}
+ if $enable_packages {
+ package { 'rubygem-deltacloud-client':
+ provider => 'yum', ensure => 'absent',
+ require => Package['deltacloud-aggregator']}
+ }
### Stop the deltacloud services
service { 'condor':
diff --git a/recipes/deltacloud_recipe/manifests/core.pp b/recipes/deltacloud_recipe/manifests/core.pp
index 443268d..0c649d5 100644
--- a/recipes/deltacloud_recipe/manifests/core.pp
+++ b/recipes/deltacloud_recipe/manifests/core.pp
@@ -2,8 +2,10 @@
class deltacloud::core inherits deltacloud {
### Install the deltacloud components
- package { 'rubygem-deltacloud-core':
- provider => 'yum', ensure => 'installed', require => Yumrepo['deltacloud_arch', 'deltacloud_noarch']}
+ if $enable_packages {
+ package { 'rubygem-deltacloud-core':
+ provider => 'yum', ensure => 'installed', require => Yumrepo['deltacloud_arch', 'deltacloud_noarch']}
+ }
file { "/var/log/deltacloud-core": ensure => 'directory' }
### we need to sync time to communicate w/ cloud providers
@@ -16,15 +18,17 @@ class deltacloud::core inherits deltacloud {
service { 'deltacloud-core':
ensure => 'running',
enable => true,
- require => [Package['rubygem-deltacloud-core'],
+ require => [return_if($enable_packages, Package['rubygem-deltacloud-core']),
File['/etc/init.d/deltacloud-core']] }
}
class deltacloud::core::disabled {
### Uninstall the deltacloud components
- package { 'rubygem-deltacloud-core':
- provider => 'yum', ensure => 'absent',
- require => Service['deltacloud-core']}
+ if $enable_packages {
+ package { 'rubygem-deltacloud-core':
+ provider => 'yum', ensure => 'absent',
+ require => Service['deltacloud-core']}
+ }
### Stop the deltacloud services
service { 'deltacloud-core':
diff --git a/recipes/deltacloud_recipe/manifests/deltacloud.pp b/recipes/deltacloud_recipe/manifests/deltacloud.pp
index c7693c1..4c6cdb6 100644
--- a/recipes/deltacloud_recipe/manifests/deltacloud.pp
+++ b/recipes/deltacloud_recipe/manifests/deltacloud.pp
@@ -20,6 +20,11 @@ if $deltacloud_enable_security == "true" or $deltacloud_enable_security == "1" {
$enable_security = false
}
+if $aeolus_enable_packages == "true" or $aeolus_enable_packages == "1" {
+ $enable_packages = true
+} else {
+ $enable_packages = false
+}
# Base deltacloud class
class deltacloud {
diff --git a/recipes/deltacloud_recipe/manifests/image-factory.pp b/recipes/deltacloud_recipe/manifests/image-factory.pp
index c584d5a..6d4be23 100644
--- a/recipes/deltacloud_recipe/manifests/image-factory.pp
+++ b/recipes/deltacloud_recipe/manifests/image-factory.pp
@@ -3,14 +3,16 @@
class deltacloud::image-factory inherits deltacloud {
# TODO: Fix me, find a better way to do this...
# We need to also install this rpm from amazon
- package{"ec2-ami-tools":
- provider => "rpm",
- source => "http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.noarch.rpm",
- ensure => 'installed' }
+ if $enable_packages {
+ package{"ec2-ami-tools":
+ provider => "rpm",
+ source => "http://s3.amazonaws.com/ec2-downloads/ec2-ami-tools.noarch.rpm",
+ ensure => 'installed' }
- package { 'rubygem-deltacloud-image-builder-agent':
- provider => 'yum', ensure => 'installed',
- require => [Package['ec2-ami-tools'], Yumrepo['deltacloud_arch', 'deltacloud_noarch']]}
+ package { 'rubygem-deltacloud-image-builder-agent':
+ provider => 'yum', ensure => 'installed',
+ require => [Package['ec2-ami-tools'], Yumrepo['deltacloud_arch', 'deltacloud_noarch']]}
+ }
### Configure boxgrinder, this should go into the boxgrinder rpms eventually
@@ -49,12 +51,12 @@ class deltacloud::image-factory inherits deltacloud {
ensure => 'running',
enable => true,
require => [File['/etc/qpidd.conf'],
- Package['deltacloud-aggregator-daemons']]}
+ return_if($enable_packages, Package['deltacloud-aggregator-daemons'])]}
file { "/etc/imagefactory.yml":
source => "puppet:///modules/deltacloud_recipe/imagefactory.yml",
mode => 644 }
- $requires = [Package['rubygem-deltacloud-image-builder-agent'],
- Package['deltacloud-aggregator-daemons'],
+ $requires = [return_if($enable_packages, Package['rubygem-deltacloud-image-builder-agent']),
+ return_if($enable_packages, Package['deltacloud-aggregator-daemons']),
File['/etc/imagefactory.yml'],
Service[qpidd],
Rails::Seed::Db[seed_deltacloud_database],
@@ -88,40 +90,42 @@ class deltacloud::image-factory::disabled {
### Uninstall the deltacloud components
- package { 'rubygem-deltacloud-image-builder-agent':
- provider => 'yum', ensure => 'absent',
- require => Package['deltacloud-aggregator']}
-
- # FIXME these lingering dependencies, pulled in for
- # rubygem-deltacloud-image-builder-agent, need to be removed as
- # ec2-ami-tools and appliance-tools depend on them and using
- # 'absent' in the context of the 'yum' provider dispatches
- # to 'rpm -e' instead of 'yum erase'
- package { ['rubygem-boxgrinder-build-ec2-platform-plugin',
- 'rubygem-boxgrinder-build-centos-os-plugin',
- 'rubygem-boxgrinder-build-fedora-os-plugin']:
- provider => "yum", ensure => 'absent',
- require => Package['rubygem-deltacloud-image-builder-agent']}
- package { 'rubygem-boxgrinder-build-rhel-os-plugin':
- provider => "yum", ensure => 'absent',
- require => Package['rubygem-boxgrinder-build-centos-os-plugin']}
- package { 'rubygem-boxgrinder-build-rpm-based-os-plugin':
- provider => "yum", ensure => 'absent',
- require => Package['rubygem-boxgrinder-build-rhel-os-plugin',
- 'rubygem-boxgrinder-build-fedora-os-plugin']}
-
- package { 'ec2-ami-tools':
- provider => "yum", ensure => 'absent',
- require => Package['rubygem-boxgrinder-build-ec2-platform-plugin']}
- package { 'appliance-tools':
- provider => 'yum', ensure => 'absent',
- require => Package['rubygem-boxgrinder-build-rpm-based-os-plugin']}
- package { 'livecd-tools':
- provider => 'yum', ensure => 'absent',
- require => Package['appliance-tools']}
- package { 'python-imgcreate':
- provider => 'yum', ensure => 'absent',
- require => Package['appliance-tools', 'livecd-tools']}
+ if $enable_packages {
+ package { 'rubygem-deltacloud-image-builder-agent':
+ provider => 'yum', ensure => 'absent',
+ require => Package['deltacloud-aggregator']}
+
+ # FIXME these lingering dependencies, pulled in for
+ # rubygem-deltacloud-image-builder-agent, need to be removed as
+ # ec2-ami-tools and appliance-tools depend on them and using
+ # 'absent' in the context of the 'yum' provider dispatches
+ # to 'rpm -e' instead of 'yum erase'
+ package { ['rubygem-boxgrinder-build-ec2-platform-plugin',
+ 'rubygem-boxgrinder-build-centos-os-plugin',
+ 'rubygem-boxgrinder-build-fedora-os-plugin']:
+ provider => "yum", ensure => 'absent',
+ require => Package['rubygem-deltacloud-image-builder-agent']}
+ package { 'rubygem-boxgrinder-build-rhel-os-plugin':
+ provider => "yum", ensure => 'absent',
+ require => Package['rubygem-boxgrinder-build-centos-os-plugin']}
+ package { 'rubygem-boxgrinder-build-rpm-based-os-plugin':
+ provider => "yum", ensure => 'absent',
+ require => Package['rubygem-boxgrinder-build-rhel-os-plugin',
+ 'rubygem-boxgrinder-build-fedora-os-plugin']}
+
+ package { 'ec2-ami-tools':
+ provider => "yum", ensure => 'absent',
+ require => Package['rubygem-boxgrinder-build-ec2-platform-plugin']}
+ package { 'appliance-tools':
+ provider => 'yum', ensure => 'absent',
+ require => Package['rubygem-boxgrinder-build-rpm-based-os-plugin']}
+ package { 'livecd-tools':
+ provider => 'yum', ensure => 'absent',
+ require => Package['appliance-tools']}
+ package { 'python-imgcreate':
+ provider => 'yum', ensure => 'absent',
+ require => Package['appliance-tools', 'livecd-tools']}
+ }
### Destroy and cleanup deltacloud artifacts
diff --git a/recipes/deltacloud_recipe/manifests/iwhd.pp b/recipes/deltacloud_recipe/manifests/iwhd.pp
index ed5bd7a..d5540cf 100644
--- a/recipes/deltacloud_recipe/manifests/iwhd.pp
+++ b/recipes/deltacloud_recipe/manifests/iwhd.pp
@@ -2,10 +2,12 @@
class deltacloud::iwhd inherits deltacloud {
### Install the deltacloud components
- package { 'iwhd':
- provider => 'yum', ensure => 'installed',
- require => Yumrepo['deltacloud_arch', 'deltacloud_noarch']
- }
+ if $enable_packages{
+ package { 'iwhd':
+ provider => 'yum', ensure => 'installed',
+ require => Yumrepo['deltacloud_arch', 'deltacloud_noarch']
+ }
+ }
### Start the deltacloud services
file { "/data": ensure => 'directory' }
@@ -23,13 +25,13 @@ class deltacloud::iwhd inherits deltacloud {
service { 'mongod':
ensure => 'running',
enable => true,
- require => [Package['iwhd'], File["/data/db"]]}
+ require => [return_if($enable_package, Package['iwhd']), File["/data/db"]]}
service { 'iwhd':
ensure => 'running',
enable => true,
hasstatus => true,
require => [File['/etc/rc.d/init.d/iwhd', '/etc/iwhd/conf.js'],
- Package['iwhd'],
+ return_if($enable_package, Package['iwhd']),
Service[mongod]]}
# XXX ugly hack but iwhd might take some time to come up
@@ -45,10 +47,11 @@ class deltacloud::iwhd::disabled {
ensure => 'stopped',
enable => false,
require => Service[iwhd]}
- service { 'iwhd':
- ensure => 'stopped',
- enable => false,
- hasstatus => true}
+ if $enable_packages {
+ package { 'iwhd':
+ provider => 'yum', ensure => 'absent',
+ require => [Package['deltacloud-aggregator'], Service['iwhd']]}
+ }
### Uninstall the deltacloud components
--
1.7.2.3
13 years, 1 month
[PATCH configure] only drop db corresponding to specified RAILS_ENV
by Mo Morsi
---
recipes/deltacloud_recipe/manifests/rails.pp | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/recipes/deltacloud_recipe/manifests/rails.pp b/recipes/deltacloud_recipe/manifests/rails.pp
index 7dfadc7..c5350a1 100644
--- a/recipes/deltacloud_recipe/manifests/rails.pp
+++ b/recipes/deltacloud_recipe/manifests/rails.pp
@@ -4,7 +4,7 @@ define rails::create::db($cwd="", $rails_env=""){
exec{"create_rails_database":
cwd => $cwd,
environment => "RAILS_ENV=${rails_env}",
- command => "/usr/bin/rake db:create:all"}
+ command => "/usr/bin/rake db:create"}
}
@@ -35,6 +35,6 @@ define rails::drop::db($cwd="", $rails_env=""){
cwd => $cwd,
onlyif => "/usr/bin/test -f ${cwd}/Rakefile",
environment => "RAILS_ENV=${rails_env}",
- command => "/usr/bin/rake db:drop:all"}
+ command => "/usr/bin/rake db:drop"}
}
--
1.7.2.3
13 years, 1 month
[PATCH] Add space between model name and validation text on errors where missing.
by Matt Wagner
Fixes BZ 672977 and another instance of where a space was not used.
---
src/app/views/admin/pool_families/_form.haml | 2 +-
src/app/views/admin/providers/_form.haml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/app/views/admin/pool_families/_form.haml b/src/app/views/admin/pool_families/_form.haml
index 362b67c..093e41d 100644
--- a/src/app/views/admin/pool_families/_form.haml
+++ b/src/app/views/admin/pool_families/_form.haml
@@ -1,4 +1,4 @@
-= form.error_message_on :name, 'Name'
+= form.error_message_on :name, 'Name '
%fieldset.clear
= form.label :name,'Pool Family Name :'
= form.text_field :name, :title => 'pool_family_name', :value => @pool_family.name, :class => "clear grid_4 alpha"
diff --git a/src/app/views/admin/providers/_form.haml b/src/app/views/admin/providers/_form.haml
index fe8c9ca..b44f192 100644
--- a/src/app/views/admin/providers/_form.haml
+++ b/src/app/views/admin/providers/_form.haml
@@ -1,5 +1,5 @@
-= form.error_message_on :name, 'Name'
-= form.error_message_on :url, 'URL'
+= form.error_message_on :name, 'Name '
+= form.error_message_on :url, 'URL '
%fieldset.clear
= form.label :name,'Provider name :'
= form.text_field :name, :title => 'provider_name', :value => @provider.name, :class => "clear grid_4 alpha"
--
1.7.4
13 years, 1 month