--- bin/aeolus-services | 18 ++++++++++++- contrib/aeolus-configure.spec | 2 + recipes/aeolus_recipe/aeolus_stop_services.pp | 32 ------------------------- 3 files changed, 18 insertions(+), 34 deletions(-) delete mode 100644 recipes/aeolus_recipe/aeolus_stop_services.pp

diff --git a/bin/aeolus-services b/bin/aeolus-services index 72cd2bb..de71244 100644 --- a/bin/aeolus-services +++ b/bin/aeolus-services @@ -1,4 +1,18 @@ #!/bin/sh

-puppet /usr/share/aeolus-configure/aeolus_stop_services.pp \ - --modulepath=/usr/share/aeolus-configure/modules/ +#dependency_services=( 'mongod', 'qpidd', 'libvirtd', 'condor', 'solr', 'sshd', 'httpd' ) + +services=( 'iwhd' 'imagefactory' 'aeolus-conductor' 'aeolus-connector' 'conductor-condor_refreshd' 'conductor-dbomatic') + +core_instances=( 'mock' 'ec2-us-east-1' 'ec2-us-west-1' ) + +for instance in "${core_instances[@]}" +do + services=( ${services[@]-} $(echo "deltacloud-$instance") ) +done + + +for service in "${services[@]}" +do + service $service restart +done diff --git a/contrib/aeolus-configure.spec b/contrib/aeolus-configure.spec index c973f57..931ef73 100644 --- a/contrib/aeolus-configure.spec +++ b/contrib/aeolus-configure.spec @@ -40,6 +40,7 @@ rm -rf %{buildroot} %{__cp} -R %{pbuild}/recipes/postgres/ %{buildroot}/%{dchome}/modules/postgres %{__cp} -R %{pbuild}/bin/aeolus-configure %{buildroot}/%{_sbindir}/ %{__cp} -R %{pbuild}/bin/aeolus-cleanup %{buildroot}/%{_sbindir}/ +%{__cp} -R %{pbuild}/bin/aeolus-services %{buildroot}/%{_sbindir}/

%clean rm -rf %{buildroot} @@ -48,6 +49,7 @@ rm -rf %{buildroot} %defattr(-,root,root,-) %attr(0755, root, root) %{_sbindir}/aeolus-configure %attr(0755, root, root) %{_sbindir}/aeolus-cleanup +%attr(0755, root, root) %{_sbindir}/aeolus-services %{dchome}

%changelog diff --git a/recipes/aeolus_recipe/aeolus_stop_services.pp b/recipes/aeolus_recipe/aeolus_stop_services.pp deleted file mode 100644 index 6d9993e..0000000 --- a/recipes/aeolus_recipe/aeolus_stop_services.pp +++ /dev/null @@ -1,32 +0,0 @@ -#-- -# Copyright (C) 2010 Red Hat Inc. -# -# This library is free software; you can redistribute it and/or -# modify it under the terms of the GNU Lesser General Public -# License as published by the Free Software Foundation; either -# version 2.1 of the License, or (at your option) any later version. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# Author: Mohammed Morsi mmorsi@redhat.com -#-- - -# -# aeolus uninstallation recipe -# - -# Modules used by the recipe -import "aeolus_recipe/aeolus" - -$services = ["conductor", "core", 'iwhd', 'image-factory'] - -# stop aeolus services -dc::service{$services: - ensure => 'stopped', enable => false}