From 77be96bf6fd03a08042824677b3783c2a69f38c9 Mon Sep 17 00:00:00 2001 From: "Joshua M. Boniface" Date: Fri, 1 Sep 2023 15:42:28 -0400 Subject: [PATCH] Fix a few more splits --- roles/base/templates/etc/hosts.j2 | 6 +++--- roles/pvc/templates/pvc/pvcapid.yaml.j2 | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/roles/base/templates/etc/hosts.j2 b/roles/base/templates/etc/hosts.j2 index 9e579c1..30c26da 100644 --- a/roles/base/templates/etc/hosts.j2 +++ b/roles/base/templates/etc/hosts.j2 @@ -7,9 +7,9 @@ ff02::1 ip6-allmodes ff02::2 ip6-allrouters {% for node in pvc_nodes %} -{{ node.cluster_ip }} {{ node.hostname.split('.')[0] }}.{{ pvc_cluster_domain }} {{ node.hostname.split('.')[0] }} -{{ node.storage_ip }} {{ node.hostname.split('.')[0] }}.{{ pvc_storage_domain }} -{{ node.upstream_ip }} {{ node.hostname.split('.')[0] }}.{{ local_domain }} +{{ node.cluster_ip }} {{ node.hostname }}.{{ pvc_cluster_domain }} {{ node.hostname }} +{{ node.storage_ip }} {{ node.hostname }}.{{ pvc_storage_domain }} +{{ node.upstream_ip }} {{ node.hostname }}.{{ local_domain }} {% endfor %} {% if hosts is defined and hosts %} diff --git a/roles/pvc/templates/pvc/pvcapid.yaml.j2 b/roles/pvc/templates/pvc/pvcapid.yaml.j2 index 9502933..2b1f0c9 100644 --- a/roles/pvc/templates/pvc/pvcapid.yaml.j2 +++ b/roles/pvc/templates/pvc/pvcapid.yaml.j2 @@ -5,7 +5,7 @@ pvc: debug: False coordinators: {% for node in pvc_nodes if node.is_coordinator %} - - {{ node.hostname.split('.')[0] }} + - {{ node.hostname }} {% endfor %} # api: Configuration of the API listener api: @@ -69,7 +69,7 @@ pvc: # uses the list of coordinators storage_hosts: {% for node in pvc_nodes if node.is_coordinator %} - - {{ node.hostname.split('.')[0] }} + - {{ node.hostname }} {% endfor %} # storage_domain: The storage domain name, concatenated with the coordinators list names # to form monitor access strings