masakari: support libvirt SASL in instance monitor
Since enabling libvirt SASL authentication, the masakari instance monitor fails to connect to libvirt. We see the following error in logs: libvirt.libvirtError: authentication failed: Failed to start SASL negotiation: -4 (SASL(-4): no mechanism available: No worthy mechs found) This change adds support for SASL authentication in Masakari instance monitor. Depends-On: https://review.opendev.org/c/openstack/kolla/+/834456 Closes-Bug: #1965754 Change-Id: I974046662b383a12ac6281b725523760a96657bd
This commit is contained in:
parent
564b405a91
commit
5d28a7c89b
@ -149,3 +149,14 @@ masakari_ks_users:
|
|||||||
user: "{{ masakari_keystone_user }}"
|
user: "{{ masakari_keystone_user }}"
|
||||||
password: "{{ masakari_keystone_password }}"
|
password: "{{ masakari_keystone_password }}"
|
||||||
role: "admin"
|
role: "admin"
|
||||||
|
|
||||||
|
####################
|
||||||
|
# libvirt
|
||||||
|
####################
|
||||||
|
# Whether to enable libvirt SASL authentication.
|
||||||
|
libvirt_enable_sasl: true
|
||||||
|
# Username for libvirt SASL.
|
||||||
|
libvirt_sasl_authname: "nova"
|
||||||
|
# List of enabled libvirt SASL authentication mechanisms.
|
||||||
|
libvirt_sasl_mech_list:
|
||||||
|
- "{{ 'SCRAM-SHA-256' if libvirt_tls | bool else 'DIGEST-MD5' }}"
|
||||||
|
@ -137,3 +137,21 @@
|
|||||||
- service.enabled | bool
|
- service.enabled | bool
|
||||||
notify:
|
notify:
|
||||||
- Restart masakari-api container
|
- Restart masakari-api container
|
||||||
|
|
||||||
|
- name: Copying over libvirt SASL configuration
|
||||||
|
become: true
|
||||||
|
vars:
|
||||||
|
service_name: "{{ item.service }}"
|
||||||
|
service: "{{ masakari_services[service_name] }}"
|
||||||
|
template:
|
||||||
|
src: "{{ item.src }}"
|
||||||
|
dest: "{{ node_config_directory }}/{{ service_name }}/{{ item.dest }}"
|
||||||
|
mode: "0660"
|
||||||
|
when:
|
||||||
|
- libvirt_enable_sasl | bool
|
||||||
|
- inventory_hostname in groups[service.group]
|
||||||
|
- service.enabled | bool
|
||||||
|
with_items:
|
||||||
|
- { src: "auth.conf.j2", dest: "auth.conf", service: "masakari-instancemonitor" }
|
||||||
|
notify:
|
||||||
|
- Restart {{ service_name }} container
|
||||||
|
6
ansible/roles/masakari/templates/auth.conf.j2
Normal file
6
ansible/roles/masakari/templates/auth.conf.j2
Normal file
@ -0,0 +1,6 @@
|
|||||||
|
[credentials-default]
|
||||||
|
authname={{ libvirt_sasl_authname }}
|
||||||
|
password={{ libvirt_sasl_password }}
|
||||||
|
|
||||||
|
[auth-libvirt-default]
|
||||||
|
credentials=default
|
@ -6,7 +6,13 @@
|
|||||||
"dest": "/etc/masakari-monitors/masakari-monitors.conf",
|
"dest": "/etc/masakari-monitors/masakari-monitors.conf",
|
||||||
"owner": "masakari",
|
"owner": "masakari",
|
||||||
"perm": "0600"
|
"perm": "0600"
|
||||||
}
|
}{% if libvirt_enable_sasl | bool %},
|
||||||
|
{
|
||||||
|
"source": "{{ container_config_directory }}/auth.conf",
|
||||||
|
"dest": "/var/lib/masakari/.config/libvirt/auth.conf",
|
||||||
|
"owner": "masakari",
|
||||||
|
"perm": "0600"
|
||||||
|
}{% endif %}
|
||||||
],
|
],
|
||||||
"permissions": [
|
"permissions": [
|
||||||
{
|
{
|
||||||
|
@ -0,0 +1,6 @@
|
|||||||
|
---
|
||||||
|
fixes:
|
||||||
|
- |
|
||||||
|
Fixes an issue with Masakari instance monitor when libvirt SASL is enabled.
|
||||||
|
libvirt SASL was enabled by default in a recent change to Kolla Ansible.
|
||||||
|
`LP#1965754 <https://bugs.launchpad.net/kolla-ansible/+bug/1965754>`__
|
Loading…
x
Reference in New Issue
Block a user