AIO inventory has swift_proxy_vars and swift_vars for each container

[Matt Thompson]

The inventory on an AIO has swift_proxy_vars and swift_vars keys for each container/host, these should probably be limited to the swift hosts only.

[OpenStack Infra (hudson-openstack)]

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

[OpenStack Infra (hudson-openstack)]

Change abandoned by Matt Thompson (<email address hidden>) on branch: master
Review: https://review.openstack.org/199094
Reason: Abandoned in favour of https://review.openstack.org/#/c/201644/.

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/201644
Committed: https://git.openstack.org/cgit/stackforge/os-ansible-deployment/commit/?id=1ef256a3082759213e41ffb136596001e88de4d2
Submitter: Jenkins
Branch: master

commit 1ef256a3082759213e41ffb136596001e88de4d2
Author: git-harry <email address hidden>
Date: Tue Jul 14 16:47:17 2015 +0100

    Target AIO swift vars at specific containers

    The variables defined in etc/openstack_deploy/conf.d/swift.yml are
    added as hostvars by the dynamic inventory script. Currently the vars
    are being added to hosts that do not require them.

    There is a variable called limit_container_types that is used by the
    dynamic inventory to filter the hosts to which variables are assigned.
    This script makes use of that variable so that only swift hosts have
    these variables set.

    The dynamic inventory script checks to see if the limit_container_types
    string is in the container name as the method of filtering. This means
    that the AIO host, aio1, does not get swift_vars assigned to it. This
    commit alters the filter so that the component is checked instead of the
    container name.

    Change-Id: I945594a55ce058d822b941d08eb0ad9c5614db15
    Closes-bug: #1472261

[OpenStack Infra (hudson-openstack)]

Reviewed: https://review.openstack.org/204949
Committed: https://git.openstack.org/cgit/stackforge/os-ansible-deployment/commit/?id=b581c8bdc55b000f1ca241c041181a78045bbc7c
Submitter: Jenkins
Branch: kilo

commit b581c8bdc55b000f1ca241c041181a78045bbc7c
Author: git-harry <email address hidden>
Date: Tue Jul 14 16:47:17 2015 +0100

    Target AIO swift vars at specific containers

    The variables defined in etc/openstack_deploy/conf.d/swift.yml are
    added as hostvars by the dynamic inventory script. Currently the vars
    are being added to hosts that do not require them.

    There is a variable called limit_container_types that is used by the
    dynamic inventory to filter the hosts to which variables are assigned.
    This script makes use of that variable so that only swift hosts have
    these variables set.

    The dynamic inventory script checks to see if the limit_container_types
    string is in the container name as the method of filtering. This means
    that the AIO host, aio1, does not get swift_vars assigned to it. This
    commit alters the filter so that the component is checked instead of the
    container name.

    Change-Id: I945594a55ce058d822b941d08eb0ad9c5614db15
    Closes-bug: #1472261
    (cherry picked from commit 1ef256a3082759213e41ffb136596001e88de4d2)

[Davanum Srinivas (DIMS) (dims-v)]

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