]> git.apps.os.sepia.ceph.com Git - ceph-ci.git/commitdiff
qa/cephadm: FileNotFoundError doesn't exist in py2
authorSebastian Wagner <sebastian.wagner@suse.com>
Fri, 29 May 2020 14:04:20 +0000 (16:04 +0200)
committerSebastian Wagner <sebastian.wagner@suse.com>
Fri, 29 May 2020 14:04:20 +0000 (16:04 +0200)
Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
qa/tasks/cephadm.py

index afcec9cda35608fa03e00eb0af3fa4e8cb389104..8852c0c7be547f764a337b4435eec28db8082cba 100644 (file)
@@ -4,6 +4,7 @@ Ceph cluster task, deployed via cephadm orchestrator
 import argparse
 import configobj
 import contextlib
+import errno
 import logging
 import os
 import json
@@ -1186,6 +1187,9 @@ def add_mirror_to_cluster(ctx, mirror):
                 path=registries_conf,
                 data=new_config,
             )
-        except FileNotFoundError as e:
+        except IOError as e:  # py3: use FileNotFoundError instead.
+            if e.errno != errno.ENOENT:
+                raise
+
             # Docker doesn't ship a registries.conf
             log.info('Failed to add mirror: %s' % str(e))