Self ack, pushed.
On 09/14/2011 03:03 PM, Richard Su wrote:
Wait 1 second after deltacloud-core startup before adding providers.
Wait is needed because deltacloud-core may not have finished initializing
when configure attempts to add providers.
---
contrib/aeolus-configure.spec | 7 ++++++-
recipes/aeolus/manifests/conductor.pp | 2 +-
recipes/aeolus/manifests/deltacloud.pp | 7 +++++++
3 files changed, 14 insertions(+), 2 deletions(-)
diff --git a/contrib/aeolus-configure.spec b/contrib/aeolus-configure.spec
index 9ea5831..fdcad62 100644
--- a/contrib/aeolus-configure.spec
+++ b/contrib/aeolus-configure.spec
@@ -4,7 +4,7 @@
Summary: Aeolus Configure Puppet Recipe
Name: aeolus-configure
Version: 2.0.2
-Release: 3%{?extra_release}%{?dist}
+Release: 4%{?extra_release}%{?dist}
Group: Applications/Internet
License: GPLv2+
@@ -62,6 +62,11 @@ Aeolus Configure Puppet Recipe
%{_sbindir}/aeolus-configure-image
%changelog
+* Wed Sep 14 2011 Richard Su<rwsu(a)redhat.com> 2.0.2-4
+- single deltacloud-core
+- rhevm and vsphere configurations moved to their own profiles
+- wait 1 sec after deltacloud-core service startup before providers are added
+
* Tue Aug 30 2011 Maros Zatko<mzatko(a)redhat.com> 2.0.2-3
- Added script for restarting running services
diff --git a/recipes/aeolus/manifests/conductor.pp
b/recipes/aeolus/manifests/conductor.pp
index 1cba5cf..4442cc5 100644
--- a/recipes/aeolus/manifests/conductor.pp
+++ b/recipes/aeolus/manifests/conductor.pp
@@ -202,7 +202,7 @@ define
aeolus::conductor::provider($deltacloud_driver="",$url="",
$deltacloud_pr
use_cookies_at => '/tmp/aeolus-admin',
unless => { 'get' =>
'https://localhost/conductor/providers',
'contains' => "//html/body//a[text() =
'$name']" },
- require => [Service['aeolus-conductor'],
Exec['grant_site_admin_privs']]
+ require => [Service['aeolus-conductor'],
Exec['grant_site_admin_privs'], Exec['deltacloud-core-startup-wait']]
}
}
diff --git a/recipes/aeolus/manifests/deltacloud.pp
b/recipes/aeolus/manifests/deltacloud.pp
index fe1de2b..187888e 100644
--- a/recipes/aeolus/manifests/deltacloud.pp
+++ b/recipes/aeolus/manifests/deltacloud.pp
@@ -19,6 +19,13 @@ class aeolus::deltacloud::core {
enable => true,
hasstatus => true,
require => [Package['deltacloud-core'],
File["/var/log/deltacloud-core"]]}
+
+ # Need to pause for a second for deltacloud-core to complete startup
+ # otherwise one may see connect issues when adding providers
+ exec{"deltacloud-core-startup-wait":
+ cwd => '/bin',
+ command => "/bin/sleep 1",
+ require => Service["deltacloud-core"]}
}
class aeolus::deltacloud::ec2 {