qa/distros: configure podman to pull from docker-mirror#38650
Merged
sebastian-philipp merged 1 commit intoceph:masterfrom Dec 22, 2020
Merged
qa/distros: configure podman to pull from docker-mirror#38650sebastian-philipp merged 1 commit intoceph:masterfrom
sebastian-philipp merged 1 commit intoceph:masterfrom
Conversation
This also requires a change to cephadm.py to search for registry entries for docker.io by 'prefix' or 'location', and to only add the mirror if a mirror isn't already present Signed-off-by: Dan Mick <dmick@redhat.com>
Contributor
|
@jmolmo this fixes the ubuntu+podman issues you mentioned yesterday in the tracker |
sebastian-philipp
approved these changes
Dec 18, 2020
Comment on lines
+1267
to
1278
| dockers = [ | ||
| r for r in v2['registry'] if | ||
| r.get('prefix') == 'docker.io' or r.get('location') == 'docker.io' | ||
| ] | ||
| if dockers: | ||
| docker = dockers[0] | ||
| docker['mirror'] = [{ | ||
| "location": mirror, | ||
| "insecure": True, | ||
| }] | ||
| if 'mirror' not in docker: | ||
| docker['mirror'] = [{ | ||
| "location": mirror, | ||
| "insecure": True, | ||
| }] | ||
| return v2 |
Contributor
There was a problem hiding this comment.
let's see. I'd love to drop this code entirely from the cephadm.py task, if possible and only rely on https://github.com/ceph/ceph-cm-ansible.
Member
Author
There was a problem hiding this comment.
I'll run a test with that code removed and see how it goes.
Member
Author
There was a problem hiding this comment.
diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index 0ff2acf925a..78c1218711a 100644
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -308,8 +308,8 @@ def ceph_bootstrap(ctx, config, registry):
ctx.cluster.sh('sudo mkdir -p /etc/ceph')
ctx.cluster.sh('sudo chmod 777 /etc/ceph')
- if registry:
- add_mirror_to_cluster(ctx, registry)
+ #if registry:
+ # add_mirror_to_cluster(ctx, registry)
try:
# write seed config
log.info('Writing seed config...')
seems to have worked okay. We can just purge all that code I suppose.
Contributor
There was a problem hiding this comment.
let's make this a new PR then
Contributor
|
jenkins test docs |
Contributor
|
jenkins test api |
3 tasks
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
3 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 also requires a change to cephadm.py to search for
registry entries for docker.io by 'prefix' or 'location',
and to only add the mirror if a mirror isn't already present
Signed-off-by: Dan Mick dmick@redhat.com
Checklist
Show available Jenkins commands
jenkins retest this pleasejenkins test classic perfjenkins test crimson perfjenkins test signedjenkins test make checkjenkins test make check arm64jenkins test submodulesjenkins test dashboardjenkins test apijenkins test docsjenkins render docsjenkins test ceph-volume alljenkins test ceph-volume tox