commit 8b47dbd6fdb4c435aa5e5b8bca1cd1d26c857537
author ibumarskov <ibumarskov@mirantis.com> Wed Jun 26 12:53:34 2019 +0400
committer Ilya Bumarskov <ibumarskov@mirantis.com> Wed Jun 26 11:05:14 2019 +0000
tree 539dc257573e8e3f35a787e7c9925ed53bbc0676
parent 4ab6a8b641af0574d7bea2bde7327cdc784b2cff

Remove custom policy file and tempest role in case of contrail

Depends-On: https://gerrit.mcp.mirantis.com/41607
Change-Id: I6b3d9651a24b7933d2b1c3e7465a7466124493fc
Related-PROD: PROD-31393

_modules/runtest/tempest_sections/auth.py

diff --git a/_modules/runtest/tempest_sections/auth.py b/_modules/runtest/tempest_sections/auth.py
index 3d9b4ba..7f37e22 100644
--- a/_modules/runtest/tempest_sections/auth.py
+++ b/_modules/runtest/tempest_sections/auth.py
@@ -55,10 +55,6 @@
         # Assume if barbican is enabled in nova, its integration enabled globally.
 
         roles = []
-        contrail_enabled = conditions.BaseRule('*.opencontrail.control.enabled',
-                                               'eq', True, multiple='any')
-        if contrail_enabled.check(self.pillar):
-            roles.append("admin")
         c = conditions.BaseRule('nova.controller.enabled', 'eq', True)
         if self.get_item_when_condition_match('nova.controller.barbican.enabled', c):
             roles.append("creator")

_modules/runtest/tempest_sections/patrole_plugin.py

diff --git a/_modules/runtest/tempest_sections/patrole_plugin.py b/_modules/runtest/tempest_sections/patrole_plugin.py
index 20f6a76..8276169 100644
--- a/_modules/runtest/tempest_sections/patrole_plugin.py
+++ b/_modules/runtest/tempest_sections/patrole_plugin.py
@@ -25,12 +25,7 @@
 
     @property
     def custom_policy_files(self):
-        contrail_enabled = conditions.BaseRule('*.opencontrail.control.enabled',
-                                               'eq', True, multiple='any')
-        if contrail_enabled.check(self.pillar):
-            return '/etc/opencontrail/policy.json'
-        else:
-            pass
+        pass
 
     @property
     def test_custom_requirements(self):