From: James Gu <james.gu@att.com>
Date: Tue, 2 Feb 2021 07:08:25 +0000 (+0000)
Subject: Revert "Fix glance deactivate image test cases"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F62%2F71862%2F2;p=airship.git

Revert "Fix glance deactivate image test cases"

This reverts commit 6134b512298a75ba7d6baf89c4ce835e1138adb5.

Reason for revert: Merge Conflict

Change-Id: I4618e3a8d651caf69555c5cf7b52a8c01235e97c
signed-off-by: James Gu <james.gu@att.com>
---

diff --git a/tools/files/tempest_conf.yaml b/tools/files/tempest_conf.yaml
index 89807b7..1567530 100644
--- a/tools/files/tempest_conf.yaml
+++ b/tools/files/tempest_conf.yaml
@@ -1,11 +1,7 @@
 ---
 auth:
-<<<<<<< HEAD   (13ed0e Update treasuremap version to include upstream rbac fixes)
-    tempest_roles: admin_keystone_read
-=======
     tempest_roles: admin_glance_update
     use_dynamic_credentials: True
->>>>>>> CHANGE (153904 Fix glance deactivate image test cases)
 compute:
     max_microversion: 2.72
 compute-feature-enabled: