From 00db751646913705595a8b1b2060f844a4dc846f Mon Sep 17 00:00:00 2001 From: Maxime Gaillard Date: Wed, 4 Apr 2018 18:55:39 +0200 Subject: [PATCH] Add Openstack tenant name --- roles/kubernetes/node/defaults/main.yml | 1 + roles/kubernetes/node/templates/openstack-cloud-config.j2 | 3 +++ 2 files changed, 4 insertions(+) diff --git a/roles/kubernetes/node/defaults/main.yml b/roles/kubernetes/node/defaults/main.yml index 35a364d21..f01f661ba 100644 --- a/roles/kubernetes/node/defaults/main.yml +++ b/roles/kubernetes/node/defaults/main.yml @@ -104,6 +104,7 @@ 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')|default(lookup('env','OS_PROJECT_NAME'),true)) }}" +openstack_tenant_name: "{{ lookup('env','OS_TENANT_NAME') }}" openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME') }}" openstack_domain_id: "{{ lookup('env','OS_USER_DOMAIN_ID') }}" diff --git a/roles/kubernetes/node/templates/openstack-cloud-config.j2 b/roles/kubernetes/node/templates/openstack-cloud-config.j2 index d9934be21..e4dd33559 100644 --- a/roles/kubernetes/node/templates/openstack-cloud-config.j2 +++ b/roles/kubernetes/node/templates/openstack-cloud-config.j2 @@ -4,6 +4,9 @@ username="{{ openstack_username }}" password="{{ openstack_password }}" region="{{ openstack_region }}" tenant-id="{{ openstack_tenant_id }}" +{% if openstack_tenant_name is defined and openstack_tenant_name != "" %} +tenant-name="{{ openstack_tenant_name }}" +{% endif %} {% if openstack_domain_name is defined and openstack_domain_name != "" %} domain-name="{{ openstack_domain_name }}" {% elif openstack_domain_id is defined and openstack_domain_id != "" %}