qa/cephadm: FileNotFoundError doesn't exist in py2

Signed-off-by: Sebastian Wagner <sebastian.wagner@suse.com>
(cherry picked from commit eddb6354e157a653962e68d100c6881b5a0fdc24)

diff --git a/qa/tasks/cephadm.py b/qa/tasks/cephadm.py
index e6cbf9e7037000708a5099fba367229179141a28..60c666c81abfeb07ecdcef000ef807b7d2e8216e 100644 (file)
--- a/qa/tasks/cephadm.py
+++ b/qa/tasks/cephadm.py
@@ -6,6 +6,7 @@ from io import BytesIO
 import argparse
 import configobj
 import contextlib
+import errno
 import logging
 import os
 import json
@@ -1163,6 +1164,9 @@ def add_mirror_to_cluster(ctx, mirror):
                 path=registries_conf,
                 data=six.ensure_str(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))