From e1ae8223f9eef072263496103f1a076108a93ba0 Mon Sep 17 00:00:00 2001
From: Matthew N Heler <matthew.heler@hotmail.com>
Date: Mon, 16 Jan 2023 09:35:08 -0600
Subject: [PATCH] hacluster: Use nodename to align with nova service names
For Masakari and HACluster to work properly, the hostnames used
in HACluster need to match with the hostnames used in Nova.
Change-Id: Iac917ef4471905caab591cd64eab379e150a8524
---
ansible/roles/hacluster/tasks/bootstrap_service.yml | 8 ++++----
.../roles/hacluster/templates/hacluster_corosync.conf.j2 | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/ansible/roles/hacluster/tasks/bootstrap_service.yml b/ansible/roles/hacluster/tasks/bootstrap_service.yml
index 8d503f6740..3669143f23 100644
--- a/ansible/roles/hacluster/tasks/bootstrap_service.yml
+++ b/ansible/roles/hacluster/tasks/bootstrap_service.yml
@@ -15,12 +15,12 @@
{{ kolla_container_engine }} exec {{ pacemaker_service.container_name }}
cibadmin --modify --scope resources -X '
<resources>
- <primitive id="{{ ansible_facts.hostname }}" class="ocf" provider="pacemaker" type="remote">
- <instance_attributes id="{{ ansible_facts.hostname }}-instance_attributes">
- <nvpair id="{{ ansible_facts.hostname }}-instance_attributes-server" name="server" value="{{ 'api' | kolla_address }}"/>
+ <primitive id="{{ ansible_facts.nodename }}" class="ocf" provider="pacemaker" type="remote">
+ <instance_attributes id="{{ ansible_facts.nodename }}-instance_attributes">
+ <nvpair id="{{ ansible_facts.nodename }}-instance_attributes-server" name="server" value="{{ 'api' | kolla_address }}"/>
</instance_attributes>
<operations>
- <op id="{{ ansible_facts.hostname }}-monitor" name="monitor" interval="60" timeout="30"/>
+ <op id="{{ ansible_facts.nodename }}-monitor" name="monitor" interval="60" timeout="30"/>
</operations>
</primitive>
</resources>
diff --git a/ansible/roles/hacluster/templates/hacluster_corosync.conf.j2 b/ansible/roles/hacluster/templates/hacluster_corosync.conf.j2
index 6547272a27..734eb08a14 100644
--- a/ansible/roles/hacluster/templates/hacluster_corosync.conf.j2
+++ b/ansible/roles/hacluster/templates/hacluster_corosync.conf.j2
@@ -13,7 +13,7 @@ nodelist {
{% for host in groups['hacluster'] | sort %}
node {
ring0_addr: {{ 'api' | kolla_address(host) }}
- name: {{ hostvars[host].ansible_facts.hostname }}
+ name: {{ hostvars[host].ansible_facts.nodename }}
nodeid: {{ loop.index }}
}
{% endfor %}
--
GitLab