Synchronise 2024.1 with upstream #627
Merged
Conversation
This file contains 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
![github-actions[bot]](https://avatars.githubusercontent.com/in/15368?s=60&v=4){kind=small}
This patch modifies tasks that are delegated to localhost to use local connection. Firstly, this is correct since SSH connection is not used, and secondly, it fixes the issue when kolla-ansible is packaged in a docker container. If the local connection is not used, the tasks will fail because temporary data are stored outside the container, whereas we need it to be stored inside the container so we can read them and set_facts. Closes-Bug: #2073370 Change-Id: I9547d5da78da30bfeea8e97056cfa9308c977098 (cherry picked from commit 84e95d2)
* Use proper balancing mode when federation is enabled. Closes-Bug: #2058656 Change-Id: Ia81a6efc38ec2bdc1355d058c03568cf740fdac5 (cherry picked from commit 33d03a4)
Change-Id: I2546d714d1e6a1b648a4c6242ece18a2108b9183 (cherry picked from commit 68fd0cd)
In I70dd1751dea6bfc9bb265aeda04b3392e135324c we removed Requires=docker.service and left only After=docker.service. In a case where something starts docker.service that's enough, but if docker.service is disabled or no service is dependent on it - it won't be started. This patch adds Wants=docker.service which will try to start docker.service if it is not started or enabled but does not impose a dependency which causes restart of kolla systemd units when docker.service is restarted (see [1]). Closes-Bug: #2065168 [1]: https://www.freedesktop.org/software/systemd/man/latest/systemd.unit.html#Wants= Change-Id: Ic3acb15f7c6ba7269ef62ccc8895b6bea4fc1f4d (cherry picked from commit a8d03a2)
priteau
approved these changes
Oct 7, 2024
priteau
approved these changes
Oct 7, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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 2024.1 from upstream stable/2024.1.