From: Maros Zatko mzatko@redhat.com
--- contrib/aeolus-configure.spec | 8 +++++++- 1 files changed, 7 insertions(+), 1 deletions(-)
diff --git a/contrib/aeolus-configure.spec b/contrib/aeolus-configure.spec index 8960143..b8f7252 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: 1%{?extra_release}%{?dist} +Release: 2%{?extra_release}%{?dist}
Group: Applications/Internet License: GPLv2+ @@ -35,6 +35,7 @@ Aeolus Configure Puppet Recipe
%install %{__mkdir} -p %{buildroot}/%{aeolushome}/modules/aeolus %{buildroot}/%{_sbindir} +%{__mkdir} -p %{buildroot}/%{_bindir} %{__mkdir} -p %{buildroot}%{_sysconfdir}/aeolus-configure/nodes %{__cp} -R %{pbuild}/conf/* %{buildroot}%{_sysconfdir}/aeolus-configure/nodes %{__mv} %{buildroot}%{_sysconfdir}/aeolus-configure/nodes/custom_template.tdl %{buildroot}%{_sysconfdir}/aeolus-configure/ @@ -43,6 +44,7 @@ Aeolus Configure Puppet Recipe %{__cp} -R %{pbuild}/recipes/ntp/ %{buildroot}/%{aeolushome}/modules/ntp %{__cp} -R %{pbuild}/recipes/openssl/ %{buildroot}/%{aeolushome}/modules/openssl %{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{aeolushome}/modules/postgres +%{__cp} -R %{pbuild}/bin/aeolus-check-services %{buildroot}/%{_bindir}/ %{__cp} -R %{pbuild}/bin/aeolus-configure-image %{buildroot}/%{_sbindir}/ %{__cp} -R %{pbuild}/bin/aeolus-configure %{buildroot}/%{_sbindir}/ %{__cp} -R %{pbuild}/bin/aeolus-cleanup %{buildroot}/%{_sbindir}/ @@ -53,10 +55,14 @@ Aeolus Configure Puppet Recipe %attr(0755, root, root) %{_sbindir}/aeolus-cleanup %attr(0755, root, root) %{_sbindir}/aeolus-node %config(noreplace) %{_sysconfdir}/aeolus-configure/* +%attr(0755, root, root) %{_bindir}/aeolus-check-services %{aeolushome} %{_sbindir}/aeolus-configure-image
%changelog +* Tue Aug 16 2011 Maros Zatko mzatko@redhat.com 2.0.2-2 +- Added script for listing running services + * Wed Aug 03 2011 Mo Morsi mmorsi@redhat.com 2.0.2-1 - update to include profiles, interactive installer
From: Maros Zatko mzatko@redhat.com
--- bin/aeolus-check-services | 29 +++++++++++++++++++++++++++++ 1 files changed, 29 insertions(+), 0 deletions(-) create mode 100755 bin/aeolus-check-services
diff --git a/bin/aeolus-check-services b/bin/aeolus-check-services new file mode 100755 index 0000000..8cd51e8 --- /dev/null +++ b/bin/aeolus-check-services @@ -0,0 +1,29 @@ +#!/usr/bin/ruby +init_scripts=%w(aeolus-conductor condor deltacloud-core deltacloud-ec2-us-east-1 deltacloud-ec2-us-west-1 deltacloud-mock httpd imagefactory iwhd libvirtd mongod ntpd postgresql qpidd) + +init_scripts.each do |script| + puts "\nChecking #{script} ..." + cmd = "/etc/init.d/#{script} status" + out = `#{cmd}` + if $?.to_i == 0 + puts " \e[1;32mSuccess:\e[0m #{out.strip}" + else + puts " \e[1;31mFAILURE:\e[0m #{out.strip}" + end +end + +# Other checks +commands = [ + {:name => 'condor_q', :command => 'condor_q'}, + {:name => 'condor_status', :command => 'condor_status'} +] +commands.each do |cmd| + puts "\nChecking #{cmd[:name]} ..." + cmd = "#{cmd[:command]}" + out = `#{cmd}` + if $?.to_i == 0 + puts " \e[1;32mSuccess:\e[0m #{out.strip}" + else + puts " \e[1;31mFAILURE:\e[0m #{out.strip}" + end +end
Looks good. ACK to set.
-Mo
aeolus-devel@lists.fedorahosted.org