From e2f5c0dbb7ed52b138dd277f4c332f8e123bf799 Mon Sep 17 00:00:00 2001 From: Michal Arbet Date: Tue, 7 Jun 2022 00:04:57 +0200 Subject: [PATCH] Enable hacluster role when it is needed Masakari-hostmonitor needs to have corosync/pacemaker deployed. This patch is just changing default enable_hacluter: "no" to "yes" if masakari-hostmonitor is enabled. Closes-Bug: #1934149 Change-Id: I979d1d6d08ca0cc0a748f175da77f68bcecc2d1a --- ansible/group_vars/all.yml | 2 +- ...ge-value-of-enable-hacluster-4653fd447456f683.yaml | 11 +++++++++++ tests/templates/globals-default.j2 | 1 - 3 files changed, 12 insertions(+), 2 deletions(-) create mode 100644 releasenotes/notes/change-value-of-enable-hacluster-4653fd447456f683.yaml diff --git a/ansible/group_vars/all.yml b/ansible/group_vars/all.yml index 1909e57a6f..c9d4c7b8b2 100644 --- a/ansible/group_vars/all.yml +++ b/ansible/group_vars/all.yml @@ -622,7 +622,7 @@ enable_freezer: "no" enable_gnocchi: "no" enable_gnocchi_statsd: "no" enable_grafana: "{{ enable_monasca | bool }}" -enable_hacluster: "no" +enable_hacluster: "{{ enable_masakari_hostmonitor | bool }}" enable_heat: "{{ enable_openstack_core | bool }}" enable_horizon: "{{ enable_openstack_core | bool }}" enable_horizon_blazar: "{{ enable_blazar | bool }}" diff --git a/releasenotes/notes/change-value-of-enable-hacluster-4653fd447456f683.yaml b/releasenotes/notes/change-value-of-enable-hacluster-4653fd447456f683.yaml new file mode 100644 index 0000000000..7bf10133a5 --- /dev/null +++ b/releasenotes/notes/change-value-of-enable-hacluster-4653fd447456f683.yaml @@ -0,0 +1,11 @@ +--- +fixes: + - | + Fixes an issue when ``masakari-hostmonitor`` is enabled + while corosync/pacemaker is not deployed. + `LP#1934149 `__ +upgrade: + - | + Modifies the default value of ``enable_hacluster`` from ``no`` to + ``yes`` if ``masakari-hostmonitor`` is enabled. + `LP#1934149 `__ diff --git a/tests/templates/globals-default.j2 b/tests/templates/globals-default.j2 index a566a9af0b..a5f885465d 100644 --- a/tests/templates/globals-default.j2 +++ b/tests/templates/globals-default.j2 @@ -105,7 +105,6 @@ ironic_dnsmasq_dhcp_ranges: {% if scenario == "masakari" %} enable_masakari: "yes" -enable_hacluster: "yes" {% endif %} {% if scenario == "cells" %}