rgw/kms/kmip - pykmip.py should actually run pykmip.

The logic to deploy pykmip in teuthology was not complete.
While it deployed all the code and certs to run pykmip,
it didn't actually run it.  This commit fixes that.

Signed-off-by: Marcus Watts <mwatts@redhat.com>

diff --git a/qa/tasks/pykmip.py b/qa/tasks/pykmip.py
index 236e695e21170bdb0867a7bd452ce6a273e8dc7e..976a6fc9f205f730062321b273843ced691e5343 100644 (file)
--- a/qa/tasks/pykmip.py
+++ b/qa/tasks/pykmip.py
@@ -9,7 +9,9 @@ import tempfile
 import json
 import os
 from io import BytesIO
+from teuthology.orchestra.daemon import DaemonGroup
 from teuthology.orchestra.remote import Remote
+
 import pprint
 
 from teuthology import misc as teuthology
@@ -179,7 +181,7 @@ key_path={serverkey}
 ca_path={clientca}
 auth_suite=TLS1.2
 policy_path={confdir}
-enable_tls_client_auth=True
+enable_tls_client_auth=False
 tls_cipher_suites=
     TLS_RSA_WITH_AES_128_CBC_SHA256
     TLS_RSA_WITH_AES_256_CBC_SHA256
@@ -251,15 +253,30 @@ def configure_pykmip(ctx, config):
     finally:
         pass
 
+def has_ceph_task(tasks):
+    for task in tasks:
+        for name, conf in task.items():
+            if name == 'ceph':
+                return True
+    return False
+
 @contextlib.contextmanager
 def run_pykmip(ctx, config):
-    try:
-        yield
-    finally:
-        return
     assert isinstance(config, dict)
+    if hasattr(ctx, 'daemons'):
+        pass
+    elif has_ceph_task(ctx.config['tasks']):
+        log.info('Delay start pykmip so ceph can do once-only daemon logic')
+        try:
+            yield
+        finally:
+            pass
+    else:
+        ctx.daemons = DaemonGroup()
     log.info('Running pykmip...')
 
+    pykmipdir = get_pykmip_dir(ctx)
+
     for (client, _) in config.items():
         (remote,) = ctx.cluster.only(client).remotes.keys()
         cluster_name, _, client_id = teuthology.split_role(client)
@@ -267,17 +284,11 @@ def run_pykmip(ctx, config):
         # start the public endpoint
         client_public_with_id = 'pykmip.public' + '.' + client_id
 
-        run_cmd = ['cd', get_pykmip_dir(ctx), run.Raw('&&'),
-                   '.', '.pykmipenv/bin/activate', run.Raw('&&'),
-                   'HOME={}'.format(get_pykmip_dir(ctx)), run.Raw('&&'),
-                   'bin/pykmip-api',
-                   run.Raw('& { read; kill %1; }')]
-                   #run.Raw('1>/dev/null')
-
-        run_cmd = 'cd ' + get_pykmip_dir(ctx) + ' && ' + \
+        run_cmd = 'cd ' + pykmipdir + ' && ' + \
                   '. .pykmipenv/bin/activate && ' + \
-                  'HOME={}'.format(get_pykmip_dir(ctx)) + ' && ' + \
-                  'exec bin/pykmip-api & { read; kill %1; }'
+                  'HOME={}'.format(pykmipdir) + ' && ' + \
+                  'exec pykmip-server -f pykmip.conf -l ' + \
+                  pykmipdir + '/pykmip.log & { read; kill %1; }'
 
         ctx.daemons.add_daemon(
             remote, 'pykmip', client_public_with_id,
@@ -285,13 +296,13 @@ def run_pykmip(ctx, config):
             args=['bash', '-c', run_cmd],
             logger=log.getChild(client),
             stdin=run.PIPE,
-            cwd=get_pykmip_dir(ctx),
+            cwd=pykmipdir,
             wait=False,
             check_status=False,
         )
 
         # sleep driven synchronization
-        run_in_pykmip_dir(ctx, client, ['sleep', '15'])
+        time.sleep(10)
     try:
         yield
     finally: