container_cidr missing from openstack_inventory.json in newton+

[Miguel Alejandro Cantu]

Thank you Nolan for helping to pin this down!

In mitaka, the container_cidr variables was added into the "vars" dictionary inside openstack_inventory.json. For example:

    "all": {
        "vars": {
            "container_cidr": "172.29.236.0/22",
            "external_lb_vip_address": "146.20.36.8",
            "internal_lb_vip_address": "172.29.236.100",
            "management_bridge": "br-mgmt",
            "provider_networks": [ ...

In newton, container_cidr is no longer there:

    "all": {
        "vars": {
            "external_lb_vip_address": "104.130.228.66",
            "internal_lb_vip_address": "172.29.236.100",
            "management_bridge": "br-mgmt",
            "provider_networks": [ ...

This key pair value is being deleted as part of this code here: https://github.com/openstack/openstack-ansible/blob/master/lib/generate.py#L797-L800

Running the dynamic_inventory.py script in debug mode yields:

..
932 - _parse_global_variables: Applied global_overrides
937 - _parse_global_variables: Deleting key container_cidr from inventory
..

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: master
Review: https://review.openstack.org/410331

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/410331
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible/commit/?id=f4d73c404cebbde741877525a76286060835ae0b
Submitter: Jenkins
Branch: master

commit f4d73c404cebbde741877525a76286060835ae0b
Author: Nolan Brubaker <email address hidden>
Date: Tue Dec 13 12:21:21 2016 -0500

    Don't delete container_cidr key when overriding

    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.

    Change-Id: I5c48adea5920c1524be75939a75af6bed3a9743a
    Closes-Bug: #1649632

[OpenStack Infra (hudson-openstack)]

Fix proposed to branch: stable/newton
Review: https://review.openstack.org/410397

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/openstack-ansible 15.0.0.0b2 development milestone.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/410397
Committed: https://git.openstack.org/cgit/openstack/openstack-ansible/commit/?id=299264a67d5a34ff62c34a7977624706c1cea851
Submitter: Jenkins
Branch: stable/newton

commit 299264a67d5a34ff62c34a7977624706c1cea851
Author: Nolan Brubaker <email address hidden>
Date: Tue Dec 13 16:08:08 2016 -0500

    Don't delete container_cidr key when overriding

    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.

    Change-Id: I5c48adea5920c1524be75939a75af6bed3a9743a
    Closes-Bug: #1649632

[OpenStack Infra (hudson-openstack)]

This issue was fixed in the openstack/openstack-ansible 14.0.5 release.