mirror of
https://github.com/puppetlabs/vmpooler.git
synced 2026-01-26 10:08:40 -05:00
(maint) Fix EXTRA_CONFIG merge behavior
Before this change if an extra config file had new keys they would get merged to the main config but if it contained an existing key, like 'providers' it would overwrite the original config. Adding a library 'deep_merge' to do a more natural merge, where existing keys get sub-elements added together and arrays are combined like for the pool configuration. Adding spec tests around EXTRA_CONFIG as they were missing, by adding and testing two new extra_config.yaml fixture files
This commit is contained in:
parent
39dc26e485
commit
23efcc4cc0
5 changed files with 39 additions and 2 deletions
4
spec/fixtures/extra_config1.yaml
vendored
Normal file
4
spec/fixtures/extra_config1.yaml
vendored
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
---
|
||||
:providers:
|
||||
:alice:
|
||||
foo: "foo"
|
||||
Loading…
Add table
Add a link
Reference in a new issue