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 support for override defaults file #871

Merged
merged 4 commits into from Feb 8, 2016
Merged

add support for override defaults file #871

merged 4 commits into from Feb 8, 2016

Conversation

@tpetr
Copy link
Member

tpetr commented Feb 2, 2016

This PR adds support for pulling in an additional Singularity configuration file which overrides values from the default one. This is useful if you need to lock down S3 / database / LDAP credentials but would like the other settings to have looser read/write permissions.

tpetr added 2 commits Feb 2, 2016
if (oldVal == null || oldVal.isNull()) {
to.put(newFieldName, newVal);
} else if (oldVal.isArray() && newVal.isArray()) {
((ArrayNode) oldVal).addAll((ArrayNode) newVal);

This comment has been minimized.

Copy link
@jhaber

jhaber Feb 2, 2016

Member

For this use-case do you think the behavior should be to append or to overwrite?

This comment has been minimized.

Copy link
@tpetr

tpetr Feb 2, 2016

Author Member

good eye -- probably overwrite

@tpetr tpetr added the hs_staging label Feb 2, 2016
@tpetr tpetr added this to the 0.4.9 milestone Feb 2, 2016
…tead of append arrays
@hs-jenkins-bot hs-jenkins-bot changed the title add support for override configuration file add support for override defaults file Feb 2, 2016
@tpetr tpetr modified the milestones: 0.4.9, 0.4.10 Feb 2, 2016
@tpetr tpetr added the hs_qa label Feb 3, 2016
@tpetr tpetr added the hs_stable label Feb 3, 2016
tpetr added a commit that referenced this pull request Feb 8, 2016
add support for override defaults file
@tpetr tpetr merged commit 2f2b651 into master Feb 8, 2016
2 checks passed
2 checks passed
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
@tpetr tpetr deleted the override-config branch Feb 8, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants
You can’t perform that action at this time.