openstack/kolla-ansible
Code Issues Proposed changes

Merge "hacluster: Use nodename to align with nova service names"

Browse Source
This commit is contained in:
Zuul
2023-02-22 20:38:43 +00:00
committed by Gerrit Code Review
parent d03875763e e1ae8223f9
commit ad745bf1f8
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ansible/roles/hacluster/tasks/bootstrap_service.yml
View File

@@ -15,12 +15,12 @@
{{ kolla_container_engine }} exec {{ pacemaker_service.container_name }} {{ kolla_container_engine }} exec {{ pacemaker_service.container_name }}
cibadmin --modify --scope resources -X ' cibadmin --modify --scope resources -X '
<resources> <resources>
<primitive id="{{ ansible_facts.hostname }}" class="ocf" provider="pacemaker" type="remote"> <primitive id="{{ ansible_facts.nodename }}" class="ocf" provider="pacemaker" type="remote">
<instance_attributes id="{{ ansible_facts.hostname }}-instance_attributes"> <instance_attributes id="{{ ansible_facts.nodename }}-instance_attributes">
<nvpair id="{{ ansible_facts.hostname }}-instance_attributes-server" name="server" value="{{ 'api' | kolla_address }}"/> <nvpair id="{{ ansible_facts.nodename }}-instance_attributes-server" name="server" value="{{ 'api' | kolla_address }}"/>
</instance_attributes> </instance_attributes>
<operations> <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> </operations>
</primitive> </primitive>
</resources> </resources>

2
ansible/roles/hacluster/templates/hacluster_corosync.conf.j2
View File

@@ -13,7 +13,7 @@ nodelist {
{% for host in groups['hacluster'] | sort %} {% for host in groups['hacluster'] | sort %}
node { node {
ring0_addr: {{ 'api' | kolla_address(host) }} ring0_addr: {{ 'api' | kolla_address(host) }}
name: {{ hostvars[host].ansible_facts.hostname }} name: {{ hostvars[host].ansible_facts.nodename }}
nodeid: {{ loop.index }} nodeid: {{ loop.index }}
} }
{% endfor %} {% endfor %}