Merge upstream stein #43
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
If there was some error during pushing then Kolla was greeting with "all went fine" message anyway: INFO:kolla.common.utils.aodh-api:Trying to push the image ERROR:kolla.common.utils.aodh-api:Get http://10.101.16.1:5000/v2/: dial tcp 10.101.16.1:5000: connect: no route to host INFO:kolla.common.utils.aodh-api:Pushed successfully This patch changes that. Now if there is an error during push then proper exception is raised to PushTask and image is marked with PUSH_ERROR status. This way at the end of build it is easy to spot which images did not got pushed to registry: INFO:kolla.common.utils:=========================== INFO:kolla.common.utils:Images that failed to build INFO:kolla.common.utils:=========================== ERROR:kolla.common.utils:base Failed with status: push_error ERROR:kolla.common.utils:nova-api Failed with status: push_error ERROR:kolla.common.utils:nova-base Failed with status: push_error ERROR:kolla.common.utils:nova-compute Failed with status: push_error ERROR:kolla.common.utils:nova-compute-ironic Failed with status: push_error ERROR:kolla.common.utils:nova-conductor Failed with status: push_error Closes-Bug: #1848019 Change-Id: Id2ab97bf4c0dc3423268a0ea435b56f4a65f7196 (cherry picked from commit 52cac09)
There appears to be a bug in the prometheus openstack exporter versions <= 0.2.1 causing cinder data to stop being collected after about 24 hours. Bumping to latest stable version 0.6.0. Change-Id: Iccaf4c0bb79e7e33072e37aa83711b37938d6719 Signed-off-by: Keith Plant <kplantjr@gmail.com> (cherry picked from commit cd7f78e)
Barbican refers to python3 but uwsgi refers to python2. This change fixes this issue. Change-Id: I508bb082a319955b3e008235e158eaa07a1e8a74 Closes-Bug: #1849128 (cherry picked from commit 823e45a)
Attempts affect pre failures. This means we can increase stability of jobs by rejecting nodes that fail pre without failing runs at the same time (unless we are really unlucky and hit b0rken nodes 5 times in a row). This change is adapted from I17b7f878c742fa8db66f738526855a02ab9f1905 in kolla-ansible. Change-Id: Ied5d2cb8ffa47b90833ee3cf241797601906f9b2 (cherry picked from commit 98fb7dc)
Stein only I508bb082a319955b3e008235e158eaa07a1e8a74 was backported to stein to fix an issue with barbican images which contained the python 2 version of uwsgi-plugin-python on Ubuntu/Debian, but should have used uwsgi-plugin-python3. However, in Stein only Ubuntu/Debian binary images used python 3 - not source images. This change reverts to uwsgi-plugin-python for Ubuntu/Debian source. Change-Id: I62c1a42c29ce7273028f99edbb77f4362a2452ce Related-Bug: #1849128
Disables other sources with qpid packages. Change-Id: I508b8258e0d0aacfa0e4ff56706b5f273d2fbf0a Closes-bug: #1850044 (cherry picked from commit e41e86c)
Change-Id: I242945edba84b891ccbf82d5fcce8ef5fe37ad3d (cherry picked from commit 939a560)
Change-Id: Ifc69728d0ab6b8653d315a2bd87dd4e4d632af30
markgoddard
approved these changes
Oct 31, 2019
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.
In particular we need: https://review.opendev.org/#/c/692112/