openstack/tripleo-common
Code Issues Proposed changes

Merge "Force lowercase hostnames"

Browse Source
This commit is contained in:
Zuul
2018-07-05 10:54:43 +00:00
committed by Gerrit Code Review
parent 3d7779afd7 acd1bed607
commit ffc92cbd38
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tripleo_common/inventory.py
View File

@@ -206,7 +206,7 @@ class TripleoInventory(object):
for role, hostnames in role_net_hostname_map.items(): for role, hostnames in role_net_hostname_map.items():
if hostnames: if hostnames:
names = hostnames.get(self.host_network) or [] 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] for n in names]
ips = role_net_ip_map[role][self.host_network] ips = role_net_ip_map[role][self.host_network]
hosts = {} hosts = {}

4
tripleo_common/templates/deployments.yaml
View File

@@ -1,10 +1,10 @@
- name: Lookup deployment UUID - name: Lookup deployment UUID
set_fact: 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 }}" - name: "Render deployment file for {{ item }}"
copy: 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 }}" dest: "/var/lib/heat-config/tripleo-config-download/{{ item ~ '-' ~ deployment_uuid }}"
become: true become: true

2
tripleo_common/utils/config.py
View File

@@ -49,7 +49,7 @@ class Config(object):
for idx, name in enumerate(shortnames): for idx, name in enumerate(shortnames):
if 'server_ids' in role_node_id_map: if 'server_ids' in role_node_id_map:
server_id = role_node_id_map['server_ids'][role][idx] server_id = role_node_id_map['server_ids'][role][idx]
servers[server_id] = name servers[server_id] = name.lower()
return servers return servers
def get_deployment_data(self, stack, def get_deployment_data(self, stack,