From: Casey Bodley <cbodley@redhat.com>
Date: Mon, 17 Jun 2019 15:54:36 +0000 (-0400)
Subject: qa/rgw: fix import error in tasks/swift.py
X-Git-Tag: v15.1.0~2443^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=refs%2Fpull%2F28605%2Fhead;p=ceph.git

qa/rgw: fix import error in tasks/swift.py

> ImportError: No module named packaging

replaces packaging.version.Version with distutils.version.LooseVersion

Signed-off-by: Casey Bodley <cbodley@redhat.com>
---

diff --git a/qa/tasks/swift.py b/qa/tasks/swift.py
index ef3027a70601..00d4de4c0a4e 100644
--- a/qa/tasks/swift.py
+++ b/qa/tasks/swift.py
@@ -8,7 +8,7 @@ import contextlib
 import logging
 import os
 
-from packaging import version
+from distutils.version import LooseVersion
 from teuthology import misc as teuthology
 from teuthology import contextutil
 from teuthology.config import config as teuth_config
@@ -241,8 +241,7 @@ def task(ctx, config):
 
         # http://tracker.ceph.com/issues/40304 can't bootstrap on rhel 7.6+
         (remote,) = ctx.cluster.only(client).remotes.keys()
-        os_version = version.parse(remote.os.version):
-        if remote.os.type == 'rhel' and os_version >= version.Version('7.6'):
+        if remote.os.name == 'rhel' and LooseVersion(remote.os.version) >= LooseVersion('7.6'):
             log.warning('Swift tests cannot run on rhel 7.6+, skipping client {client}'.format(client))
             continue