Language and terminology updates #153
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…luster where appropriate
|
Manual test 1
|
|
AWS large build
|
|
AWS XL build
|
|
google standard build 2018.1 and upgrade to 2018.5 Upgrade performed locally |
reidmv
suggested changes
Jun 1, 2021
There was a problem hiding this comment.
LGTM! I am going to suggest one change.
For peadm::oid('peadm_role'), we should use puppet/server, instead of puppet/primary. This is to avoid potential confusion about what is primary, and what is replica. Those terms expand out to, respectively, "primary Puppet server" and "replica Puppet server" so that label should be congruent.
Besides that, I think we're good to go!
I'm also going to create a 2.x tracking branch before merging this PR to main, since this change marks where we'll have to cut a new major version.
|
Curious, @reidmv, why peadm doesn't deploy https://puppet.com/docs/puppet/7/config_file_oid_map.html? |
|
@vchepkov good quesiton. I think the summary is, the feature is difficult to use and rely on. The decision not to use a
In essence, a friendly short-name cannot be used in addition to an OID, it can only be used instead of an OID. A correctly configured For us to use We don't do any catalog-based management of files today, and so can't automatically fix or correct changes to Overall, it seems questionable if the benefit is worth the complexity cost. It's certainly possible to revisit the idea if someone has an idea for a cleaner way around these problems. |
Agree with the changesmakes a lot more sense, updated and tested. See output below. We do haver a ticket for that new release so can pull that in if we create the branch SOLARCH-397
|
…ith primary and replica
reidmv
approved these changes
Jun 2, 2021
timidri
changed the title
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The terms, variables and values that have changed are as follows
deployment to cluster
master_host to primary_host
master_replica_host to primary_replica_host
master_target to primary_target
master_replica_target to primary_replica_target
master_certname to primary_certname
master to primary
HA to DR
high-availability to disaster-recovery
TRUSTED FACT
peadm::oid('peadm_role') => 'puppet/master', to peadm::oid('peadm_role') => 'puppet/primary',
NODE GROUP
PE Master B to PE Primary B
PE Master A to PE Primary A
None of the following puppet settings can be updated as all appear to still be in with no alternative https://github.com/puppetlabs/puppet-enterprise-modules/tree/main/modules/puppet_enterprise/manifests/profile and https://github.com/puppetlabs/puppet-enterprise-modules/tree/main/modules/puppet_enterprise/manifests
puppet_enterprise::profile::master
puppet_enterprise::profile::master::puppetdb
puppet_enterprise::profile::primary_master_replica
puppet_enterprise::profile::master::java_args
puppet_enterprise::puppet_master_host