From: James Gu <james.gu@att.com>
Date: Wed, 13 Jan 2021 17:15:27 +0000 (-0800)
Subject: Fix glance deactivate image test cases
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F60%2F71860%2F1;p=airship.git

Fix glance deactivate image test cases

Needed to add admin_glance_update role to tempest conf that is
required by Airship 1.8 glance policy

Signed-off-by: James Gu <james.gu@att.com>
Change-Id: I286cfbe6c5e3344962a3ba2689ccabd49846a806
(cherry picked from commit 153904a37e7bf4278e6370a4f27eb3a3ac10bfd0)
---

diff --git a/tools/files/tempest_conf.yaml b/tools/files/tempest_conf.yaml
index d5431ac..89807b7 100644
--- a/tools/files/tempest_conf.yaml
+++ b/tools/files/tempest_conf.yaml
@@ -1,6 +1,11 @@
 ---
 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: