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

Add new eyaml_pkcs7_public/private_key params #127

Merged
merged 1 commit into from
May 2, 2016

Conversation

alexjfisher
Copy link
Member

This commit adds two new optional parameters.
These are eyaml_pkcs7_public_key and eyaml_pkcs7_private_key.

If specified, the values will be used in the generated hiera.yaml file.
If not given, behaviour remains unchanged and the keys are assumed to be
in the 'keysdir' directory.

This change allows more complicated hiera eyaml configuration. For
example, my current manually configured hiera.yaml contains...

:eyaml:
  :pkcs7_private_key: /etc/puppet/keys/%{::product}/private_key.pkcs7.pem
  :pkcs7_public_key:  /etc/puppet/keys/public/%{::product}_key.pkcs7.pem

I have multiple sets of keys, (one pair per 'product'), and the private
and public keys aren't in the same directory.

@jyaworski
Copy link
Member

@alexjfisher can you try to force push so the test will rerun?

@alexjfisher
Copy link
Member Author

Pinning rubocop to 0.33 and most of the tests are now passing. It looks like the module needs some effort to work with strict variables enabled though.

This commit adds two new optional parameters.
These are eyaml_pkcs7_public_key and eyaml_pkcs7_private_key.

If specified, the values will be used in the generated hiera.yaml file.
If not given, behaviour remains unchanged and the keys are assumed to be
in the 'keysdir' directory.

This change allows more complicated hiera eyaml configuration.  For
example, my current manually configured hiera.yaml contains...
```
:eyaml:
  :pkcs7_private_key: /etc/puppet/keys/%{::product}/private_key.pkcs7.pem
  :pkcs7_public_key:  /etc/puppet/keys/public/%{::product}_key.pkcs7.pem
```

I have multiple sets of keys, (one pair per 'product'), and the private
and public keys aren't in the same directory.
@alexjfisher
Copy link
Member Author

rebased

@jyaworski jyaworski merged commit 6c16819 into voxpupuli:master May 2, 2016
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.

2 participants