diff options
| -rw-r--r-- | tools/files/tempest_conf.yaml | 4 |
1 files changed, 0 insertions, 4 deletions
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: |