When merging multiple envs, 0 values where ignored in later envs, not
taking precedence. This fixes it by checking for None instead.
Change-Id: Ia0da6988f92825bcc9a19dd3dcce771baa978a59
Closes-Bug: #1669442
It would raise an error if conflicting merge strategies
are specified for a paramater or parameter_default in
environment files.
Change-Id: I9f7b15cde73b370a0cdd71a94e9f88e804cb3819
Closes-Bug: #1644217
Now we can use the param schema to decide the type for
parameters/parameter defaults and the param specific
merge startegy when doing environment merging.
Change-Id: Idd08d9729deac463175c1bbfd70230b9700afad8
Blueprint: environment-merging
This allows for merging lists and deep merging maps.
This does not support comma_delimited_lists and is
implemented by using parameter schema in the subsequent
patches.
Change-Id: I89df95eca713a7125cc53ed8bf352274f28bf6d9
Blueprint: environment_merging
This moves the merge_environment utility function
from service.py to environment_util.py.
Change-Id: Ia005cf47d5e655e60359f8da397a712e749ce13c
Blueprint: environment-merging
This adds three merge startegies(overwrite, merge, deep-merge).
There can be a default merge startegy for an env or parameter
specific merge strategy. if none of the above is specified
then it defaults to 'overwrite'.
Change-Id: I05f56887d762342981e3cb9885872ef58ecd0ad8
Blueprint: environment-merging
Thomas Herve