Merge pull request #1087 from bradbeam/openstack

Adding openstack domain id

roles/kubernetes/preinstall/defaults/main.yml

@@ -28,6 +28,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'),true)  }}"
+openstack_domain_name: "{{ lookup('env','OS_USER_DOMAIN_NAME')  }}"
 
 # For the vsphere integration, kubelet will need credentials to access
 # vsphere apis

roles/kubernetes/preinstall/templates/openstack-cloud-config.j2

@@ -3,4 +3,7 @@ auth-url={{ openstack_auth_url }}
 username={{ openstack_username }}
 password={{ openstack_password }}
 region={{ openstack_region }}
-tenant-id={{ openstack_tenant_id }}
+tenant-id={{ openstack_tenant_id }}
+{% if openstack_domain_name is defined and openstack_domain_name != "" %}
+domain-name={{ openstack_domain_name }}
+{% endif %}