Skip to content

Commit

Permalink
(QENG-5040) Run puppet after simplified mono install
Browse files Browse the repository at this point in the history
Previous to this commit, the new simplified mono install method was not
running puppet on the master node in a mono only scenario. If the
install included agents not of the masters OS, then puppet would of been
ran due to needing to add pe_repo classes. In the scenario of mono
master only, if puppet is not ran, then setup is not considered complete
due to exported resources, mcollective and facts not being setup yet.
This would cause numerous issues, such as no facts in puppetdb (so
anyaltic tests for example would fail) until a test somewhere in the
pipeline ran puppet agent on the master node.
This commit adds a call outside of the parallel agent run on non infra
agents due to the fact that with exported resources, the classifier
service will restart, so need to run the master first, then after that
all the agents can run.
  • Loading branch information
ericwilliamson committed Jun 2, 2017
1 parent f8218db commit 01b9617
Showing 1 changed file with 1 addition and 0 deletions.
1 change: 1 addition & 0 deletions lib/beaker-pe/install/pe_utils.rb
Original file line number Diff line number Diff line change
Expand Up @@ -485,6 +485,7 @@ def simple_monolithic_install(master, agents, opts={})
end

step "Run puppet to setup mcollective and pxp-agent" do
on(master, puppet_agent('-t'), :acceptable_exit_codes => [0,2])
run_puppet_on_non_infrastructure_nodes(all_hosts)

#Workaround for windows frictionless install, see BKR-943 for the reason
Expand Down

0 comments on commit 01b9617

Please sign in to comment.