Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use puppet-agent specific helper when installing the MSI #43

Merged
merged 2 commits into from
Apr 26, 2018

Conversation

joshcooper
Copy link
Contributor

This is a partial revert of commit 5a9c90f. When installing
puppet-agent packages we need to use the install_msi_on helper, because
it sets the service startup type to manual, which prevents the service
from starting and sending a CSR before we've configured the agent. It
also verifies that the service startup is correct after installation,
otherwise you can get transient failures if the background agent service
is running while performing puppet agent -t runs in the foreground.

When installing MSI packages for other projects, use the
generic_install_msi_on method.

This is a partial revert of commit 5a9c90f. When installing
puppet-agent packages we need to use the install_msi_on helper, because
it sets the service startup type to manual, which prevents the service
from starting and sending a CSR before we've configured the agent. It
also verifies that the service startup is correct after installation,
otherwise you can get transient failures if the background agent service
is running while performing puppet agent -t runs in the foreground.

When installing MSI packages for other projects, use the
generic_install_msi_on method.
When the master host also has an agent role, we don't want to manually
run `puppet agent -t`, because puppetserver will generate the
self-signed CA and server certs when it starts. Rather than checking for
the role, enumerate the agents, skipping the agent if it is also the
master host.

Add a comment about why we're deleting the contents of the ssldir
instead of the directory.
@joshcooper
Copy link
Contributor Author

I ended up not being able to make larger changes because we need to make sure the master's cert has the required dns alt names.

@joshcooper joshcooper closed this Apr 26, 2018
@joshcooper joshcooper reopened this Apr 26, 2018
@joshcooper joshcooper requested a review from melissa April 26, 2018 22:46
@joshcooper
Copy link
Contributor Author

/cc @MikaelSmith @ekinanp

@melissa melissa merged commit 92598e7 into puppetlabs:master Apr 26, 2018
@melissa
Copy link
Contributor

melissa commented Apr 26, 2018

Do you want me to cut a new beaker-puppet release now, or wait?

@joshcooper joshcooper deleted the windows-puppet-agent-msi branch April 26, 2018 23:41
@joshcooper
Copy link
Contributor Author

Please do @melissa! That should resolve the windows CI failures we're seeing in puppet-agent#5.5.x and master.

@melissa
Copy link
Contributor

melissa commented Apr 27, 2018

done!

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants