Browse Source
Merge pull request #2639 from ironhouzi/openstack_tenant_id_fix
Fix new envvar for setting openstack_tenant_id
pull/2640/head
Aivars Sterns
6 years ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with
1 additions and
1 deletions
-
roles/kubernetes/node/defaults/main.yml
|
|
|
@ -101,7 +101,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')|default(lookup('env','OS_PROJECT_ID'),true) }}" |
|
|
|
openstack_tenant_id: "{{ lookup('env','OS_TENANT_ID')|lookup('env','OS_PROJECT_ID')|default(lookup('env','OS_PROJECT_NAME'),true) }}" |
|
|
|
openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}" |
|
|
|
openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}" |
|
|
|
|
|
|
|
|
