Don't merge Vagrantfile configs when merging targets to upsert to db
This commit is contained in:
parent
e9426b7a89
commit
34c4bac2ec
@ -194,10 +194,13 @@ func (s *State) targetPut(
|
||||
return erro
|
||||
}
|
||||
if foundTarget != nil {
|
||||
// Make sure the config doesn't get merged - we want the config to overwrite the old config
|
||||
finalConfig := proto.Clone(value.Configuration)
|
||||
// Merge found target with provided target
|
||||
proto.Merge(value, foundTarget)
|
||||
value.ResourceId = foundTarget.ResourceId
|
||||
value.Uuid = foundTarget.Uuid
|
||||
value.Configuration = finalConfig.(*vagrant_plugin_sdk.Vagrantfile_MachineConfig)
|
||||
} else {
|
||||
s.log.Trace("target has no resource id and could not find matching target, assuming new target",
|
||||
"target", value)
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user