Comment 2 for bug 1649632

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