C12s/c12s-kubespray
3
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Bug fix: support kilo's keystone requirement for domain-name, extracts from ENV var

Browse source
This commit is contained in:
Xavier Lange 2017-01-25 14:34:54 -08:00 committed by Brad Beam
parent 27b4e61c9f
commit dd10b8a27c
2 changed files with 3 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
roles/kubernetes/preinstall/defaults/main.yml
View file

@ -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') }}"
# Container Linux by CoreOS cloud init config file to define /etc/resolv.conf content
# for hostnet pods and infra needs

3
roles/kubernetes/preinstall/templates/openstack-cloud-config.j2
View file

@ -3,4 +3,5 @@ auth-url={{ openstack_auth_url }}
username={{ openstack_username }}
password={{ openstack_password }}
region={{ openstack_region }}
tenant-id={{ openstack_tenant_id }}
tenant-id={{ openstack_tenant_id }}
domain-name={{ openstack_domain_name }}