]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/cephadm: Docker doesn't ship a registries.conf
authorSebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 May 2020 11:17:58 +0000 (13:17 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Wed, 27 May 2020 11:17:58 +0000 (13:17 +0200)
I guess not using the mirror for docker based tests is ok for now.

For adding docker support, we need to:

1. change the docker config
2. restart the docker daemon

Note that Docker's config only supports to mirror the docker.io registry.

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
qa/tasks/cephadm.py

index 98f5e35f1975b553a4d626e3ea4b757dd6c392ed..0256cdbc247edfbab188fddfa5f40e0affcab636 100644 (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))