diff options
| author | Dominic Maraglia <dmaraglia@gmail.com> | 2011-05-04 16:48:02 -0700 |
|---|---|---|
| committer | Dominic Maraglia <dmaraglia@gmail.com> | 2011-05-04 16:48:02 -0700 |
| commit | 92905ffb9f1538f226e2710ff1b6abb7c059672c (patch) | |
| tree | e50c527e4727029dee809cc03dfe898191ce9d2d /acceptance | |
| parent | 8d792a06399c4399c16a3add752e2f48f27f5c04 (diff) | |
| download | puppet-92905ffb9f1538f226e2710ff1b6abb7c059672c.tar.gz puppet-92905ffb9f1538f226e2710ff1b6abb7c059672c.tar.xz puppet-92905ffb9f1538f226e2710ff1b6abb7c059672c.zip | |
fixed test for ticket_7117
Need to restart puppet master to detect changes made to auth.conf
Diffstat (limited to 'acceptance')
| -rw-r--r-- | acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb index bd0599d86..76a6bf818 100644 --- a/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb +++ b/acceptance/tests/ticket_7117_broke_env_criteria_authconf.rb @@ -11,6 +11,17 @@ allow * step "Save original auth.conf file and create a temp auth.conf" on master, "cp #{config['puppetpath']}/auth.conf /tmp/auth.conf-7117; echo '#{add_2_authconf}' > #{config['puppetpath']}/auth.conf" +# Kill running Puppet Master -- should not be running at this point +step "Master: kill running Puppet Master" +on master, "ps -U puppet | awk '/puppet/ { print \$1 }' | xargs kill || echo \"Puppet Master not running\"" +step "Master: Start Puppet Master" +on master, puppet_master("--certdnsnames=\"puppet:$(hostname -s):$(hostname -f)\" --verbose --noop") + + +# Run test on Agents +step "Agent: agent --test" +on agents, puppet_agent("--test") + step "Fetch agent facts from Puppet Master" agents.each do |host| on(host, "curl -k -H \"Accept: yaml\" https://#{master}:8140/override/facts/\`hostname -f\`") do |