Commit f426eb98d1e4dc0b8b65f9191b038edcea849755 added a global_override
deletion mechanism, but did not account for the automatically-created
container_cidr key.
This change ensures the key is skipped in deletion, and adds further
tests for the _parse_gloabl_variables function.
Backported to Newton manually because the dynamic_inventory.py file was split
at the beginning of the Ocata cycle.
Reviewed: https:/ /review. openstack. org/410397 /git.openstack. org/cgit/ openstack/ openstack- ansible/ commit/ ?id=299264a67d5 a34ff62c34a7977 624706c1cea851
Committed: https:/
Submitter: Jenkins
Branch: stable/newton
commit 299264a67d5a34f f62c34a79776247 06c1cea851
Author: Nolan Brubaker <email address hidden>
Date: Tue Dec 13 16:08:08 2016 -0500
Don't delete container_cidr key when overriding
Commit f426eb98d1e4dc0 b8b65f9191b038e dcea849755 added a global_override created
deletion mechanism, but did not account for the automatically-
container_cidr key.
This change ensures the key is skipped in deletion, and adds further gloabl_ variables function.
tests for the _parse_
Backported to Newton manually because the dynamic_ inventory. py file was split
at the beginning of the Ocata cycle.
Change-Id: I5c48adea5920c1 524be75939a75af 6bed3a9743a
Closes-Bug: #1649632