Merge "Force lowercase hostnames"
This commit is contained in:
commit
ffc92cbd38
@ -206,7 +206,7 @@ class TripleoInventory(object):
|
||||
for role, hostnames in role_net_hostname_map.items():
|
||||
if hostnames:
|
||||
names = hostnames.get(self.host_network) or []
|
||||
shortnames = [n.split(".%s." % self.host_network)[0]
|
||||
shortnames = [n.split(".%s." % self.host_network)[0].lower()
|
||||
for n in names]
|
||||
ips = role_net_ip_map[role][self.host_network]
|
||||
hosts = {}
|
||||
|
@ -1,10 +1,10 @@
|
||||
- name: Lookup deployment UUID
|
||||
set_fact:
|
||||
deployment_uuid: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname ~ '/' ~ item) | from_yaml | json_query(item ~ '.id')}}"
|
||||
deployment_uuid: "{{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item) | from_yaml | json_query(item ~ '.id')}}"
|
||||
|
||||
- name: "Render deployment file for {{ item }}"
|
||||
copy:
|
||||
content: "[ {{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname ~ '/' ~ item) | from_yaml | json_query(item) }} ]"
|
||||
content: "[ {{ lookup('file', tripleo_role_name ~ '/' ~ ansible_hostname | lower ~ '/' ~ item) | from_yaml | json_query(item) }} ]"
|
||||
dest: "/var/lib/heat-config/tripleo-config-download/{{ item ~ '-' ~ deployment_uuid }}"
|
||||
become: true
|
||||
|
||||
|
@ -49,7 +49,7 @@ class Config(object):
|
||||
for idx, name in enumerate(shortnames):
|
||||
if 'server_ids' in role_node_id_map:
|
||||
server_id = role_node_id_map['server_ids'][role][idx]
|
||||
servers[server_id] = name
|
||||
servers[server_id] = name.lower()
|
||||
return servers
|
||||
|
||||
def get_deployment_data(self, stack,
|
||||
|
Loading…
x
Reference in New Issue
Block a user