Merge pull request #949 from vmtyler/master

Fixes Support for OpenStack v3 credentials
This commit is contained in:
Bogdan Dobrelya 2017-02-03 12:22:00 +01:00 committed by GitHub
commit e53d3fe9c8

View file

@ -24,7 +24,7 @@ openstack_auth_url: "{{ lookup('env','OS_AUTH_URL') }}"
openstack_username: "{{ lookup('env','OS_USERNAME') }}" openstack_username: "{{ lookup('env','OS_USERNAME') }}"
openstack_password: "{{ lookup('env','OS_PASSWORD') }}" openstack_password: "{{ lookup('env','OS_PASSWORD') }}"
openstack_region: "{{ lookup('env','OS_REGION_NAME') }}" openstack_region: "{{ lookup('env','OS_REGION_NAME') }}"
openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID') }}" openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')|default(lookup('env','OS_PROJECT_ID'),true) }}"
# All clients access each node individually, instead of using a load balancer. # All clients access each node individually, instead of using a load balancer.
etcd_multiaccess: true etcd_multiaccess: true