Sync upstream stable/victoria #81
Merged
Conversation
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
Zuul 4.6.0 does not allow to set ansible_python_interpreter. [1] Instead, with the current Zuul and Ansible, this should be automatically set to the proper python. This patch is required to restore the jobs which are ignored otherwise. [2] [3] Additionally, this change avoids the use of Ansible's pip module because it tries to use setuptools from the ansible_python_interpreter first even if another executable is set. [1] http://lists.openstack.org/pipermail/openstack-discuss/2021-June/023291.html [2] http://lists.openstack.org/pipermail/openstack-discuss/2021-June/023326.html [3] http://lists.openstack.org/pipermail/openstack-discuss/2021-June/023321.html Change-Id: Ib74eecd46617af51e23a3ccad664767b1bf6e04f
epel-release now installs epel*.repos with following baseurl: baseurl=https://download.example/pub/epel/$releasever/Everything/$basearch Change-Id: I19f57d258021ff660df6b6b95e8205b69f3bea85 (cherry picked from commit acc8cb9)
The binary images include python3-rados as a dependency, but source images do not. This change fixes that. Change-Id: I2c8cdfcd25856ecdcfd9f302965187b3b62376ad Closes-Bug: #1927756 (cherry picked from commit c29f818)
* Replace current URL with the proper target. Change-Id: I0bb8b2429906e698858f6b699e4c4d8bacc2dd74 Closes-Bug: #1934763 (cherry picked from commit 1f8ac21)
Change-Id: I4ce8244a3fb034493a75f4096de2640e11b48931 Closes-Bug: #1931867 (cherry picked from commit fb218ff)
boto3 library is needed [1] for glance_store and didn't installed yet since [2] adds s3 support back. this change adds both binary and source parts to install boto3 library. 1. https://github.com/openstack/glance_store/blob/04e5ead7c000211a4c10104ed2bb65c9df7681ae/setup.cfg#L76 2. I203134837319080ead96da69048baf90086d2117 Closes-Bug: #1884259 Change-Id: I199185e24cedd2e282c53460a24aeffc83478a12 Signed-off-by: Maksim Malchuk <maksim.malchuk@gmail.com> (cherry picked from commit 53b391d)
* Use distribution based dumb-init package. Change-Id: I75927b6016bdb7577fbff354632bdab6407f359c Related-Bug: #19311980 (cherry picked from commit 5940d17)
Change-Id: Ibb23c9d0caf115fcbba7bd322ecebe8d80b6821a (cherry picked from commit be544f4)
Patch adds a script in the monasca-thresh image that can be used to check if a topology exists in Storm, and optionally kill it. This is part of a bug in kolla-ansible where topologies were not submitted to Storm, but run locally. This patch includes a topology check script enabled by KOLLA_BOOTSTRAP which will exit kolla_start if the topology exists, and optionally enables topology removal (to allow replacement) enabled by TOPOLOGY_REPLACE. Topology names and various timeouts may be customized. If the new env variables are not set, existing behavior is unchanged. Partial-Bug: #1808805 Change-Id: If8f0730031435dda4235b7f2d2c23e5f5f767f87
…ictoria Change-Id: I7e7b0768e77defa85025760f7008f38dd3bb0fc8
priteau
requested review from
dougszumski,
markgoddard,
mnasiadka,
cityofships and
bbezak
markgoddard
reviewed
Aug 18, 2021
|
|
||
| {% if use_dumb_init %} | ||
|
|
||
| {% block dumb_init_installation %} |
There was a problem hiding this comment.
I guess we broke anyone who overrides this block...
There was a problem hiding this comment.
Could add it back as an empty block?
There was a problem hiding this comment.
We could do, although the installation method has changed so it may be best if users remove it.
markgoddard
approved these changes
Aug 18, 2021
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.
No description provided.