Please review pull request #130: (maint) killing the agents could disguise issues with PE opened by (justinstoller)
Description:
...not being in a sane state after install
Previously we were stopping the agents, running an agent -t and then starting the service.
This could mask issues when the installer leaves the agent's service in a state where a restart is required.
This will alone will not catch the issue in #12373 as it was a case depending on different answers than we supply. But it will safe guard against this kind of issue in the future.
- Opened: Thu Feb 02 17:22:27 UTC 2012
- Based on: puppetlabs:pe2.0.x (d5f13ebddec7bce3edb6307614d51e897aec5e8e)
- Requested merge: justinstoller:dont_kill_the_agents (a6ca35808aa3ee1aaa2d765d670c5d09d7953bb0)
Diff follows:
diff --git a/setup/pe/05_Agent_test.rb b/setup/pe/05_Agent_test.rb
index d4b23cb..20e9d04 100755
--- a/setup/pe/05_Agent_test.rb
+++ b/setup/pe/05_Agent_test.rb
@@ -1,22 +1,6 @@
test_name "Agent --test post install"
-step 'Running pupept agent --test on each agent'
-zzz=20
-agents.each do |agent|
- if agent['platform'].include?('solaris')
- on(agent, '/usr/sbin/svcadm disable -s svc:/network/puppetagent:default')
- sleep zzz
- on(agent, puppet_agent("--test"), :acceptable_exit_codes => [0,2])
- on(agent, '/usr/sbin/svcadm enable svc:/network/puppetagent:default')
- elsif agent['platform'].include?('debian') or agent['platform'].include?('ubuntu')
- on(agent, '/etc/init.d/pe-puppet-agent stop')
- sleep zzz
- on(agent, puppet_agent("--test"), :acceptable_exit_codes => [0,2])
- on(agent, '/etc/init.d/pe-puppet-agent start')
- else
- on(agent, '/etc/init.d/pe-puppet stop')
- sleep zzz
- on(agent, puppet_agent("--test"), :acceptable_exit_codes => [0,2])
- sleep zzz
- on(agent, '/etc/init.d/pe-puppet start')
- end
-end
+step 'Running puppet agent --test on each agent'
+
+sleep 20
+
+on agents, puppet_agent('--test')
-- You received this message because you are subscribed to the Google Groups "Puppet Developers" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to [email protected].
For more options, visit this group at http://groups.google.com/group/puppet-dev?hl=en.
