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

Exclude ldap in -running.json if disabled. #1247

Merged
merged 1 commit into from
May 2, 2017

Conversation

marcparadise
Copy link
Member

This ensures that addons can continue to rely on the presence of the ldap key instead of
the internals to indicate whether ldap is enabled.

  • Added a helper function to generate the chef-server running content to
    OmnibusHelper
  • Moved solr attribute compat logic there
  • made the content lazy so that it's not evaluated until we're done.

Signed-off-by: Marc A. Paradise [email protected]

Copy link
Contributor

@stevendanna stevendanna left a comment

Choose a reason for hiding this comment

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

This looks good to me.

In addition:

* Added a helper function to generat eh chef-server running content to
  OmnibusHelper
* Moved solr filtering/logic there
* made the content lazy so that it's not evaluated until we're done.

Signed-off-by: Marc A. Paradise <[email protected]>
@marcparadise marcparadise force-pushed the mp/do-not-write-ldap-block-when-disabled branch from 2777901 to 6981969 Compare May 2, 2017 17:01
@marcparadise marcparadise merged commit f8fe06d into master May 2, 2017
@stevendanna stevendanna deleted the mp/do-not-write-ldap-block-when-disabled branch May 15, 2017 14:39
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