From e88a3a6f72f0aad27abf5138a37ff363d0cb3829 Mon Sep 17 00:00:00 2001
From: Jesse Pretorius <jesse.pretorius@rackspace.co.uk>
Date: Tue, 3 Jul 2018 18:35:34 +0100
Subject: [PATCH] Disable keystone_authtoken/service_token_roles_required for
 now

Sahara currently cannot use this option, so we work around it being
set by default in the os_nova role by disabling it via a config
override.

This allows other roles to still use it by default, but specifically
disables it for os_sahara tests.

Change-Id: I11e342975e6a043fdba455d01c6dcfadbef1984f
---
 tests/os_sahara-overrides.yml | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/tests/os_sahara-overrides.yml b/tests/os_sahara-overrides.yml
index a3cc4fc..c6fae35 100644
--- a/tests/os_sahara-overrides.yml
+++ b/tests/os_sahara-overrides.yml
@@ -22,3 +22,10 @@ tempest_plugins:
 
 tempest_test_whitelist:
   - sahara_tempest_plugin.tests.api
+
+# TODO(odyssey4me):
+# Remove this once sahara supported the nova.conf
+# option enabled.
+nova_nova_conf_overrides:
+  keystone_authtoken:
+    service_token_roles_required: False