From ec1c47bc5aea625d47fafbe9d07c3cabaf73238f Mon Sep 17 00:00:00 2001 From: Tyler Britten Date: Fri, 27 Jan 2017 10:26:20 -0500 Subject: [PATCH 1/2] 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 From 6b29c6c70211fda7118804c78f2087fb135aab74 Mon Sep 17 00:00:00 2001 From: Tyler Britten Date: Fri, 27 Jan 2017 10:47:59 -0500 Subject: [PATCH 2/2] Fixed for non-null output --- 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 8cc15ad1d..610f74dcd 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')|default(lookup('env','OS_PROJECT_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