Skip to content

Synchronise 2025.1 with upstream #832

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Alex-Welsh merged 2 commits into from
Dec 22, 2025
Merged

Synchronise 2025.1 with upstream #832

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c1520c
prometheus: Fix running blackbox-exporter on podman
mnasiadka Mar 20, 2025
199a5a9
Fix incorrect mariadb-recovery task name in error message
VuDn5 Dec 5, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion ansible/roles/mariadb/tasks/lookup_cluster.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@

- name: Fail on existing but stopped cluster
fail:
msg: MariaDB cluster exists but is stopped. Please start it using kolla-ansible mariadb_recovery
msg: MariaDB cluster exists but is stopped. Please start it using kolla-ansible mariadb-recovery
when:
# NOTE(yoctozepto): we allow single-node cluster to start
- groups[mariadb_shard_group] | length > 1
Expand Down
2 changes: 2 additions & 0 deletions ansible/roles/prometheus/defaults/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,6 +121,8 @@ prometheus_services:
volumes: "{{ prometheus_elasticsearch_exporter_default_volumes + prometheus_elasticsearch_exporter_extra_volumes }}"
dimensions: "{{ prometheus_elasticsearch_exporter_dimensions }}"
prometheus-blackbox-exporter:
cap_add:
- CAP_NET_RAW
container_name: "prometheus_blackbox_exporter"
group: "prometheus-blackbox-exporter"
enabled: "{{ enable_prometheus_blackbox_exporter | bool }}"
Expand Down
1 change: 1 addition & 0 deletions ansible/roles/prometheus/handlers/main.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,6 +112,7 @@
become: true
kolla_container:
action: "recreate_or_restart_container"
cap_add: "{{ service.cap_add }}"
common_options: "{{ docker_common_options }}"
name: "{{ service.container_name }}"
image: "{{ service.image }}"
Expand Down
2 changes: 1 addition & 1 deletion doc/source/admin/mariadb-backup-and-restore.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ pointing to the first node of the cluster:

.. code-block:: console

kolla-ansible mariadb_recovery -i multinode -e mariadb_recover_inventory_name=controller1
kolla-ansible mariadb-recovery -i multinode -e mariadb_recover_inventory_name=controller1

The above procedure is valid also for a disaster recovery scenario. In such
case, first copy MariaDB backup file from the external source into
Expand Down
2 changes: 1 addition & 1 deletion doc/source/user/operating-kolla.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -210,7 +210,7 @@ containers.
``kolla-ansible destroy -i INVENTORY`` is used to clean up containers and
volumes in the cluster.

``kolla-ansible mariadb_recovery -i INVENTORY`` is used to recover a
``kolla-ansible mariadb-recovery -i INVENTORY`` is used to recover a
completely stopped mariadb cluster.

``kolla-ansible prechecks -i INVENTORY`` is used to check if all requirements
Expand Down