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

Fix pull #66 again after pull #56 was merged #68

Merged
merged 1 commit into from
Nov 19, 2019

Conversation

erik-frontify
Copy link
Contributor

Pull #56 stopped pull #66 from working. This commit should fix #66 again
without stopping #56 from working

Pull camptocamp#56 stopped pull camptocamp#66 from working. This commit should fix camptocamp#66 again
without stopping camptocamp#56 from working
ssh_authorized_key { $_ssh_authorized_key_title:
ensure => $ensure,
key => $::accounts::ssh_keys[$ssh_key]['public'],
options => $::accounts::ssh_keys[$ssh_key]['options'],
options => $_options,
Copy link
Contributor

Choose a reason for hiding this comment

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

Maybe use pick for that:

options => pick($::accounts::ssh_keys[$ssh_key]['options'], $options),

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I think I tried that but it didn't work. Pick only works if there is at least one non empty value. But by default both variables are not set.

Copy link
Contributor

Choose a reason for hiding this comment

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

oh, I see

@raphink raphink merged commit 923e870 into camptocamp:master Nov 19, 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.

2 participants