Comment 8 for bug 1560032

Reviewed: https://review.openstack.org/296979
Committed: https://git.openstack.org/cgit/openstack/heat/commit/?id=6de960c37ef217464dfe19d683ea6dad228e841b
Submitter: Jenkins
Branch: stable/liberty

commit 6de960c37ef217464dfe19d683ea6dad228e841b
Author: Rabi Mishra <email address hidden>
Date: Fri Jan 29 22:23:21 2016 +0530

    Accommodate v2 and v3 auth for integration tests

    This patch has two reviews:

    1. devstack has moved default Keystone API version to v3[1].
    [1] https://github.com/openstack-dev/devstack/commit/f4ce44bf3fbf06e53c2ae3ec6aa4996831cf4605
    Though the above patch has been reverted, this would help
    if devstack removes v2 support in the future.

    2. use domain env variables as defaults.
    Use OS_USER_DOMAIN_NAME and OS_PROJECT_DOMAIN_NAME
    env variables as the defaults for keystone v3 in
    integration tests.

    Squash of commit e80d27213cf4489aeeda48e2bdb5a890d8b56433
    and commit 55713b94bf31409b4b0f8d3ba9ea9bc3b598f34a

    Closes-Bug: #1539692
    Closes-Bug: #1560032

    Change-Id: I393750d00b3712a015e48a3cf38ab5f95bb61dae