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

Update logic for PE 2015.x (again) #102

Merged
merged 1 commit into from
Jan 27, 2016
Merged

Update logic for PE 2015.x (again) #102

merged 1 commit into from
Jan 27, 2016

Conversation

hunner
Copy link
Member

@hunner hunner commented Jan 11, 2016

Some day I will get this right.

It looks like leaving the keys/ directory and hiera.yaml in the codedir
on recent puppet versions causes issues. Also the datadir default needs
to change on recent versions of puppet. So a major release is needed :(


exec { 'install ruby gem hiera-eyaml':
command => "gem install hiera-eyaml ${gem_flag}",
creates => $vendored_gem_creates,
creates => '/opt/puppet/bin/eyaml',

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/opt/puppetlabs/puppet/bin/eyaml? would need to run it but I don't think that path is correct

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is only for PE 3.x

@smbambling
Copy link
Contributor

I did have an issue with the keys in the $codedir as well. My current solution for that is to have the module set the $confdir to be /etc/puppetlabs/code-staging on 2015.3 and above. That way file-sync can also distribute the keys to compile only master and directly to the mom itself.

If the keys dir is placed in /etc/puppetlabs/puppet/keys they you have to have some other tooling to get your keys out to your other masters.

@@ -182,6 +185,14 @@ The following parameters are available for the hiera class:
Arbitrary YAML content to append to the end of the hiera.yaml config file.
This is useful for configuring backend-specific parameters.
Default: `''`
* `provider`
Which provider to use to install hiera-eyaml. Can be `puppetserver_gem` (PE 2015.x), `pe_puppetserver_gem` (PE 3.7 and 3.8), `pe_gem` (PE pre-3.7), `puppet_gem` (FOSS using puppet's gem), or `gem` (FOSS using system's gem)
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't the puppetserver_gem compatible with both FOSS and PE systems that have Puppet >=4.0.0 ( Running Puppet Server )

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, but there is no way to detect a foss puppetserver master vs. a foss ruby puppet master, so I default to just using puppet_gem. It's suboptimal, but I can't figure out how to fix it...

@hunner hunner force-pushed the patch_pe branch 2 times, most recently from a33dade to 75ea559 Compare January 22, 2016 22:40
@hunner
Copy link
Member Author

hunner commented Jan 22, 2016

Hmm. Good point about the keys. I've added a keysdir parameter so that the keys can be put wherever you'd like them and hiera.conf will be updated with the new path.

@hunner hunner force-pushed the patch_pe branch 8 times, most recently from 5bd9931 to e24b80b Compare January 27, 2016 00:49
Some day I will get this right.

It looks like leaving the keys/ directory and hiera.yaml in the codedir
on recent puppet versions causes issues. Also the confdir/datadir
default needs to change on recent versions of puppet. So a major release
is needed :(
hunner added a commit that referenced this pull request Jan 27, 2016
Fixes bug in the latest push from PR #102, that doesn't use the _keysdir path when creating keys
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

3 participants