From da01bc1fbb4e7dd02cffdd2c2ea0a7234d890cf5 Mon Sep 17 00:00:00 2001
From: Tyler Britten <tbritten@us.ibm.com>
Date: Fri, 27 Jan 2017 10:26:20 -0500
Subject: [PATCH] Updated OpenStack vars to check for tenant_id (v2) and
project_id (v3)
---
roles/kubernetes/preinstall/defaults/main.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/roles/kubernetes/preinstall/defaults/main.yml b/roles/kubernetes/preinstall/defaults/main.yml
index 1515c93ce..8cc15ad1d 100644
--- 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')) }}"
# All clients access each node individually, instead of using a load balancer.
etcd_multiaccess: true
--
GitLab