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

Added ability fo fully bootstrap Code manager #25

Merged
merged 3 commits into from Oct 2, 2019

Conversation

dylanratcliffe
Copy link
Contributor

This adds the ability to properly bootstrap code manager by making the following major changes:

  • Added the ability to specify a private key
    • Added the functionality to sync this private key to the masters if it's local so that they are fully ready to deploy code

In order to get this working we needed to improve a few things, mostly around how pe.conf is generated:

  • Move pe.conf from templates to fully dynamic config files
  • Added $pe_conf_data to allow users to specify any pe.conf settings without requiring template changes
  • $pe_conf_data also allows the hardcoded settings like puppet_enterprise::profile::puppetdb::database_host to be overridden if required for some reason

@reidmv
Copy link
Contributor

reidmv commented Sep 27, 2019

@dylanratcliffe I refactored these commits a little to:

  1. Make it clearer what was being changed in each commit, so that individual proposals were easier to separate and evaluate
  2. Minor implementation cleanup
  3. Suggested simplification of the r10k_private_key portion

Please take a look and let me know what you think of the adjustments. Happy to chat real-time if you want! Just ping me on Slack. :)

Dylan Ratcliffe added 2 commits September 27, 2019 17:38
Provide parameters that match 80% of users' experience configuring
code-manager. Namely, add r10k_remote and r10k_private_key settings.
@reidmv
Copy link
Contributor

reidmv commented Oct 1, 2019

@dylanratcliffe updated with the changes we discussed. Have not tested this code yet but logically it should be complete. Thoughts?

@reidmv reidmv force-pushed the code_manager branch 2 times, most recently from ee6e2df to 8026086 Compare October 1, 2019 14:50
Observationally:

  - We ALWAYS want to configure Code Manager
  - We ALWAYS want the private key location configured the same
  - We can use pe_conf_data to override anything if we need to
  - We don't want magic

To that end, this commit simplifies the r10k private key input to
require that the key content is supplied OR the path to a local file
containing the key. The two parameters are different, and mutually
exclusive.
@reidmv reidmv merged commit bcbd7b9 into puppetlabs:master Oct 2, 2019
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.

None yet

2 participants