openstack/kolla-ansible
Code Issues Proposed changes

Control Masakari monitors deploy

Browse Source 
Add a switches to enable/disable deploy of the Masakari monitors.

Change-Id: I3ab603f7cab7946ea8f2e063fe91190d6592066a
Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com>
This commit is contained in:
Maksim Malchuk 2022-05-24 15:15:00 +03:00
parent 9549e8ccfe
commit d3dbd812c5
4 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ansible/group_vars/all.yml
View File

@ -661,6 +661,8 @@ enable_manila_backend_cephfs_nfs: "no"
enable_manila_backend_glusterfs_nfs: "no" enable_manila_backend_glusterfs_nfs: "no"
enable_mariabackup: "no" enable_mariabackup: "no"
enable_masakari: "no" enable_masakari: "no"
enable_masakari_instancemonitor: "{{ enable_masakari | bool }}"
enable_masakari_hostmonitor: "{{ enable_masakari | bool }}"
enable_mistral: "no" enable_mistral: "no"
enable_monasca: "no" enable_monasca: "no"
enable_multipathd: "no" enable_multipathd: "no"

4
ansible/roles/masakari/defaults/main.yml
View File

@ -28,7 +28,7 @@ masakari_services:
masakari-instancemonitor: masakari-instancemonitor:
container_name: masakari_instancemonitor container_name: masakari_instancemonitor
group: masakari-instancemonitor group: masakari-instancemonitor
enabled: true enabled: "{{ enable_masakari_instancemonitor | bool }}"
image: "{{ masakari_monitors_image_full }}" image: "{{ masakari_monitors_image_full }}"
volumes: "{{ masakari_instancemonitor_default_volumes + masakari_instancemonitor_extra_volumes }}" volumes: "{{ masakari_instancemonitor_default_volumes + masakari_instancemonitor_extra_volumes }}"
privileged: True privileged: True
@ -36,7 +36,7 @@ masakari_services:
masakari-hostmonitor: masakari-hostmonitor:
container_name: masakari_hostmonitor container_name: masakari_hostmonitor
group: masakari-hostmonitor group: masakari-hostmonitor
enabled: true enabled: "{{ enable_masakari_hostmonitor | bool }}"
ipc_mode: host ipc_mode: host
image: "{{ masakari_monitors_image_full }}" image: "{{ masakari_monitors_image_full }}"
volumes: "{{ masakari_hostmonitor_default_volumes + masakari_hostmonitor_extra_volumes }}" volumes: "{{ masakari_hostmonitor_default_volumes + masakari_hostmonitor_extra_volumes }}"

9
doc/source/reference/compute/masakari-guide.rst
View File

@ -13,6 +13,9 @@ KVM-based Virtual Machine(VM)s from failure events such as VM process down,
provisioning process down, and nova-compute host failure. Masakari also provisioning process down, and nova-compute host failure. Masakari also
provides an API service to manage and control the automated rescue mechanism. provides an API service to manage and control the automated rescue mechanism.
Kolla deploys Masakari API, Masakari Engine and Masakari Instance Monitor Kolla deploys Masakari API, Masakari Engine and Masakari Monitor containers
containers which are the main Masakari components only if ``enable_masakari`` which are the main Masakari components only if ``enable_masakari`` is set in
is set in ``/etc/kolla/globals.yml``. ``/etc/kolla/globals.yml``. By default, both the Masakari Host Monitor and
Masakari Instance Monitor containers are enabled. The deployment of each type
of monitors can be controlled individually via
``enable_masakari_instancemonitor`` and ``enable_masakari_hostmonitor``.

8
releasenotes/notes/control-masakari-monitors-1107c10c45678b0a.yaml Normal file
View File

@ -0,0 +1,8 @@
---
features:
- |
New switches added to control deployment of the Masakari monitors. The
deployment of each type of monitors can be controlled individually via
``enable_masakari_instancemonitor`` and ``enable_masakari_hostmonitor``.
By default, both are set to ``true`` when the deployment of the Masakari
is enabled via ``enable_masakari``.