summaryrefslogtreecommitdiffstats
path: root/tools
diff options
context:
space:
mode:
authorJames Gu <james.gu@att.com>2021-01-13 09:15:27 -0800
committerJames Gu <james.gu@att.com>2021-02-02 07:01:42 +0000
commit001dae2d26f53e07010b828caa1ca6c05936289c (patch)
tree150f2f8d812d2d179fa46bc0fd89346b06c44e96 /tools
parent13ed0ee7455ddb80d0ca7db2c09fb7f078bd7f9e (diff)
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)
Diffstat (limited to 'tools')
-rw-r--r--tools/files/tempest_conf.yaml5
1 files changed, 5 insertions, 0 deletions
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: