From 779137f60fbcda8197a63d1d93380d5cad962223 Mon Sep 17 00:00:00 2001
From: Chris MacNaughton <chris.macnaughton@canonical.com>
Date: Thu, 6 May 2021 14:12:33 +0200
Subject: [PATCH] Restrict adding Octavia config

Only add Octavia's config when Octavia is in the enabled services
---
 zaza/openstack/charm_tests/tempest/setup.py | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/zaza/openstack/charm_tests/tempest/setup.py b/zaza/openstack/charm_tests/tempest/setup.py
index b22ccb7..7ae0ba3 100644
--- 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