Merge pull request #347 from ChrisMacNaughton/bug/tempest-cinder

ensure that we add the bare cinder endpoint
2020-07-06 13:32:11 +01:00
parent 6f5bd1c4b9 37dfa53baf
commit 3fa5297a1d
1 changed files with 3 additions and 0 deletions
@@ -235,6 +235,9 @@ def get_tempest_context():
        'cinder': add_cinder_config,
        'keystone': add_keystone_config}
    ctxt['enabled_services'] = get_service_list(keystone_session)
+    if set(['cinderv2', 'cinderv3']) \
+            .intersection(set(ctxt['enabled_services'])):
+        ctxt['enabled_services'].append('cinder')
    ctxt['disabled_services'] = list(
        set(TEMPEST_SVC_LIST) - set(ctxt['enabled_services']))
    add_application_ips(ctxt)