Synchronise master with upstream#681
Merged
priteau merged 16 commits intostackhpc/masterfrom Feb 10, 2025
Merged
Conversation
If a faulty HAProxy/ProxySQL configuration is applied and the backup HAProxy/ProxySQL containers have not been successfully restarted, a hard stop must be performed so that the master HAProxy/ProxySQL container with the faulty configuration is not also stopped and restarted. Change-Id: I82b2003e90993df5227c58b5511adcc391742bda
Depends-On: https://review.opendev.org/c/openstack/kolla-ansible/+/940126 Change-Id: Ice51ef729f4e27c6315815fc1d0efed21728d141
This reverts commit 7223bb7. Reason for revert: seems this is not working as intended, see the linked bug Change-Id: I19dfa02b15040cb12b04c41015ff65e2829bf210 Closes-Bug: 2097005
Removing hardcoded version number from template Closes-Bug: #2096664 Change-Id: I8e246419bbb783fa7c55f407986f45476a251252
Ensure that IPv6 listen addresses for libvirt-exporter and fluentd prometheus exporter are formatted correctly by passing them through put_address_in_context as with other prometheus exporters. Closes-Bug: #2096659 Change-Id: Ib035534e2d1a27d5f496cfc6fa1d24a3dbe1dd41
This patch removes the conditional check `om_enable_queue_manager` for `oslo_concurrency` as it was inconsistently applied across services and is actually unrelated to the queue manager. Simply said somewhere the conditional was present and somewhere it wasn't. While `oslo.concurrency` itself does not require a specific path, the implementation of the queue manager expects locks to be placed under `/var/lib/<service>/tmp`, making it necessary to define this path explicitly. Therefore, the lock path is set accordingly across all services, regardless of whether the queue manager is used. Additionally, this patch adds missing `lock_path` configurations where they were absent to ensure uniformity. Change-Id: I93bbaa61b2d8b5cb0d1a11783086b37a860173b6
This patch is just fixing ironic's configuration when ironic's prometheus exporter is turned on. More in documentation here [1]. [1] https://docs.openstack.org/ironic-prometheus-exporter/latest/configuration.html Closes-Bug: #2097096 Depends-On: https://review.opendev.org/c/openstack/kolla/+/940514 Change-Id: I360f2b7118731554d8fc81cb192809e605b627fc
Move actions responsible for info about containers from kolla_container module to kolla_container_facts. Also fixes a bug with inconsistencies between docker and podman in kolla_container_facts. Closes-bug: #2084878 Change-Id: I1db88e28a828ebf073f018b2bae1d9556ec22807 Signed-off-by: Ivan Halomi <ivan.halomi@tietoevry.com> Signed-off-by: Martin Hiner <martin.hiner@tietoevry.com> Signed-off-by: Roman Krček <roman.krcek@tietoevry.com>
github-actions
bot
added
automated
priteau
approved these changes
Feb 10, 2025
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
7 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
This PR contains a snapshot of master from upstream master.