When re-running the dynamic_inventory.py script, either directly or via
a playbook run, deployers expect that their edits to
openstack_user_config.yml are reflected in the inventory. However, previous
behavior only added new entries or updated existing variables with new
values; variables that were deleted remained in the inventory JSON
file.
This patch only corrects behavior for the variables includes in the
global_overrides dictionary. Similar behavior may be present in other
aspects of the inventory, such as removing host vars, but those should
be addressed in later patches.
Closes-Bug: #1588902
Change-Id: I86d6627ef34d99c7ef3c77fcd42c918a13f0fe81
f426eb98d1