summaryrefslogtreecommitdiffstats
path: root/qa/tasks/vault.py
diff options
context:
space:
mode:
authorKefu Chai <kchai@redhat.com>2020-03-24 09:33:57 +0100
committerKefu Chai <kchai@redhat.com>2020-03-24 11:27:55 +0100
commit80b71ef461043bfa274b2c73fb0697a0e75759cd (patch)
treea01caee79330e6cef334cbb92863775856b83cc3 /qa/tasks/vault.py
parentqa: import with full path (diff)
downloadceph-80b71ef461043bfa274b2c73fb0697a0e75759cd.tar.xz
ceph-80b71ef461043bfa274b2c73fb0697a0e75759cd.zip
qa: import py3 compatible modules using six
Signed-off-by: Kefu Chai <kchai@redhat.com>
Diffstat (limited to 'qa/tasks/vault.py')
-rw-r--r--qa/tasks/vault.py6
1 files changed, 3 insertions, 3 deletions
diff --git a/qa/tasks/vault.py b/qa/tasks/vault.py
index 34efc4f970c..f0a0b7ceefb 100644
--- a/qa/tasks/vault.py
+++ b/qa/tasks/vault.py
@@ -6,10 +6,10 @@ import argparse
import contextlib
import logging
import time
-import httplib
import json
from os import path
-from urlparse import urljoin
+from six.moves import http_client
+from six.moves.urllib.parse import urljoin
from teuthology import misc as teuthology
from teuthology import contextutil
@@ -155,7 +155,7 @@ def setup_vault(ctx, config):
def send_req(ctx, cconfig, client, path, body, method='POST'):
host, port = ctx.vault.endpoints[client]
- req = httplib.HTTPConnection(host, port, timeout=30)
+ req = http_client.HTTPConnection(host, port, timeout=30)
token = cconfig.get('root_token', 'atoken')
log.info("Send request to Vault: %s:%s at %s with token: %s", host, port, path, token)
headers = {'X-Vault-Token': token}