Adjust jobs for devstack WSGI mode default

Devstack is switching the default glance operational model back to pure-WSGI
mode for parity with the rest of the services. This adjusts our jobs to fit
with that so that we're testing the default, but also the standalone case.
After this change, we end up with the following for the vanilla devstack
jobs:

 - The "-import" job, which takes the devstack default of WSGI mode,
   with all the tweaks required for import to be enabled. It configures
   import conversion to raw, metadata injection, and confirms that with a
   post-run check for that metadata.
 - The "-import-standalone" job, which inherits all the behaviors from
   the job above, but configures glance in standalone mode.

Depends-On: https://review.opendev.org/#/c/742884
Change-Id: Ia3fb8aba83bbd7a1399aef136ce8857b14d08435

.zuul.yaml

@@ -216,32 +216,11 @@
       tox_envlist: functional-py36
 
 - job:
-    name: tempest-integrated-storage-import-workflow
+    name: tempest-integrated-storage-import
     parent: tempest-integrated-storage
     description: |
       The regular tempest-integrated-storage job but with glance metadata injection
     post-run: playbooks/post-check-metadata-injection.yaml
-    vars:
-      devstack_localrc:
-        GLANCE_STANDALONE: True
-        GLANCE_USE_IMPORT_WORKFLOW: True
-      devstack_local_conf:
-        post-config:
-          $GLANCE_IMAGE_IMPORT_CONF:
-            image_import_opts:
-              image_import_plugins: "['inject_image_metadata', 'image_conversion']"
-            inject_metadata_properties:
-              ignore_user_roles:
-              inject: |
-                "glance_devstack_test":"doyouseeme?"
-            image_conversion:
-              output_format: raw
-
-- job:
-    name: tempest-integrated-storage-wsgi-import
-    parent: tempest-integrated-storage
-    description: |
-      The regular tempest-integrated-storage job but with glance in wsgi mode
     vars:
       devstack_localrc:
         GLANCE_STANDALONE: False
@@ -255,10 +234,24 @@
               python_interpreter: /usr/bin/python3
           $GLANCE_IMAGE_IMPORT_CONF:
             image_import_opts:
-              image_import_plugins: "['image_conversion']"
+              image_import_plugins: "['inject_image_metadata', 'image_conversion']"
+            inject_metadata_properties:
+              ignore_user_roles:
+              inject: |
+                "glance_devstack_test":"doyouseeme?"
             image_conversion:
               output_format: raw
 
+- job:
+    name: tempest-integrated-storage-import-standalone
+    parent: tempest-integrated-storage-import
+    description: |
+      The regular tempest-integrated-storage-import-workflow job but with glance in
+      standalone mode
+    vars:
+      devstack_localrc:
+        GLANCE_STANDALONE: True
+
 - job:
     name: glance-ceph-thin-provisioning
     parent: devstack-plugin-ceph-tempest-py3
@@ -304,9 +297,9 @@
               - ^\.zuul\.yaml$
         - tempest-integrated-storage:
             irrelevant-files: *tempest-irrelevant-files
-        - tempest-integrated-storage-import-workflow:
+        - tempest-integrated-storage-import:
             irrelevant-files: *tempest-irrelevant-files
-        - tempest-integrated-storage-wsgi-import:
+        - tempest-integrated-storage-import-standalone:
             irrelevant-files: *tempest-irrelevant-files
         - grenade:
             irrelevant-files: *tempest-irrelevant-files
@@ -320,7 +313,9 @@
         - openstack-tox-functional-py38
         - tempest-integrated-storage:
             irrelevant-files: *tempest-irrelevant-files
-        - tempest-integrated-storage-import-workflow:
+        - tempest-integrated-storage-import:
+            irrelevant-files: *tempest-irrelevant-files
+        - tempest-integrated-storage-import-standalone:
             irrelevant-files: *tempest-irrelevant-files
         - grenade:
             irrelevant-files: *tempest-irrelevant-files