]> git-server-git.apps.pok.os.sepia.ceph.com Git - ceph.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>
Thu, 28 May 2020 13:29:16 +0000 (15:29 +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>
(cherry picked from commit 9310b6e278c78bdf3d4a6f46e3b17f6837f828ef)

qa/tasks/cephadm.py

index ee2e4ee6f6c63d69e6ba3d52386bad4b7c357724..879461170cf2ea1faa7d1495ad87678847d2fc24 100644 (file)
@@ -1150,14 +1150,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))