From acd1bed60752efbe1d40a80583f0bb696b63fe07 Mon Sep 17 00:00:00 2001 From: James Slagle Date: Tue, 19 Jun 2018 10:31:50 -0400 Subject: [PATCH] Force lowercase hostnames Updates the inventory, config-download and deployments.yaml tasks file to force using lowercase hostnames everywhere. Hostnames should be treated as case insensitive. Change-Id: If9365f53c215c656cc558f07fd6651dd4a471fbf Closes-Bug: #1777660 --- tripleo_common/inventory.py | 2 +- tripleo_common/templates/deployments.yaml | 4 ++-- tripleo_common/utils/config.py | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/tripleo_common/inventory.py b/tripleo_common/inventory.py index ff1faf640..b08918d21 100644 --- a/tripleo_common/inventory.py +++ b/tripleo_common/inventory.py @@ -204,7 +204,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 = {} diff --git a/tripleo_common/templates/deployments.yaml b/tripleo_common/templates/deployments.yaml index cdc1fbd7a..c3fd0109e 100644 --- a/tripleo_common/templates/deployments.yaml +++ b/tripleo_common/templates/deployments.yaml @@ -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 diff --git a/tripleo_common/utils/config.py b/tripleo_common/utils/config.py index 020e4de40..67c0f8950 100644 --- a/tripleo_common/utils/config.py +++ b/tripleo_common/utils/config.py @@ -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,