diff options
| author |   James Gu <james.gu@att.com> | 2021-02-02 07:08:25 +0000 |
|---|---|---|
| committer | James Gu <james.gu@att.com> | 2021-02-02 07:10:22 +0000 |
| commit | b6153c6e800463f7682cfbc3218328a93f79c7c7 (patch) | |
| tree | 702adb3802bbbac4a4049ec4c8d5047d91129f71 | |
| parent | 001dae2d26f53e07010b828caa1ca6c05936289c (diff) | |
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>
| -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: |