RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2025-02-21 18:17:42 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #35273 from sebastian-philipp/qa-cephadm-mirror-ubuntu

Browse Source 
qa/cephadm: Docker doesn't ship a registries.conf

Reviewed-by: Kefu Chai <kchai@redhat.com>
This commit is contained in:
Sebastian Wagner 2020-05-27 18:01:17 +02:00 committed by GitHub
commit ab953a4151
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
qa/tasks/cephadm.py
View File

@ -1173,14 +1173,18 @@ def add_mirror_to_cluster(ctx, mirror):
registries_conf = '/etc/containers/registries.conf'
for remote in ctx.cluster.remotes.keys():
config = teuthology.get_file(
remote=remote,
path=registries_conf
)
new_config = toml.dumps(registries_add_mirror_to_docker_io(config.decode('utf-8'), mirror))
try:
config = teuthology.get_file(
remote=remote,
path=registries_conf
)
new_config = toml.dumps(registries_add_mirror_to_docker_io(config.decode('utf-8'), mirror))
teuthology.sudo_write_file(
remote=remote,
path=registries_conf,
data=new_config,
)
teuthology.sudo_write_file(
remote=remote,
path=registries_conf,
data=new_config,
)
except FileNotFoundError as e:
# Docker doesn't ship a registries.conf
log.info('Failed to add mirror: %s' % str(e))