Merge pull request #570 from openstack-charmers/bug/octavia-always-added

Restrict adding Octavia config
2021-05-06 14:26:26 +02:00
parent e631b93541 779137f60f
commit 632218d098
1 changed files with 2 additions and 1 deletions
--- a/zaza/openstack/charm_tests/tempest/setup.py
+++ b/zaza/openstack/charm_tests/tempest/setup.py
@@ -276,7 +276,8 @@ def get_tempest_context(workspace_path):
            ctxt_func(ctxt, keystone_session)
    add_environment_var_config(ctxt, ctxt['enabled_services'])
    add_auth_config(ctxt)
-    add_octavia_config(ctxt)
+    if 'octavia' in ctxt['enabled_services']:
+        add_octavia_config(ctxt)
    return ctxt