Merge pull request #949 from vmtyler/master

Fixes Support for OpenStack v3 credentials
2017-02-03 12:22:00 +01:00 · 2017-02-03 12:22:00 +01:00 · 5a7a3f6d4a
parent 10f924a617 f8ffa1601d
commit 5a7a3f6d4a
1 changed files with 1 additions and 1 deletions
--- a/roles/kubernetes/preinstall/defaults/main.yml
+++ b/roles/kubernetes/preinstall/defaults/main.yml
@ -24,7 +24,7 @@ openstack_auth_url: "{{ lookup('env','OS_AUTH_URL')  }}"
 openstack_username: "{{ lookup('env','OS_USERNAME')  }}"
 openstack_password: "{{ lookup('env','OS_PASSWORD')  }}"
 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.
 etcd_multiaccess: true