Make FIPS job non-voting

Temporarily make the FIPS job non-voting till we figure out why
its failing. Restore the non-fips version of the cinder job so
we keep the coverage.

Change-Id: I1a9dbd087cca52798f0d01c62ebb47e37f52d87a

.zuul.yaml

@@ -255,6 +255,18 @@
             image_conversion:
               output_format: raw
 
+- job:
+    name: glance-multistore-cinder-import
+    parent: tempest-integrated-storage-import
+    description: |
+      The regular import workflow job to test with multiple cinder stores
+    vars:
+      devstack_localrc:
+        USE_CINDER_FOR_GLANCE: True
+        GLANCE_ENABLE_MULTIPLE_STORES: True
+        CINDER_ENABLED_BACKENDS: lvm:lvmdriver-1,lvm:lvmdriver-2
+        GLANCE_CINDER_DEFAULT_BACKEND: lvmdriver-1
+
 - job:
     name: glance-multistore-cinder-import-fips
     parent: tempest-integrated-storage-import
@@ -336,7 +348,10 @@
             irrelevant-files: *tempest-irrelevant-files
         - tempest-integrated-storage-import-standalone:
             irrelevant-files: *tempest-irrelevant-files
+        - glance-multistore-cinder-import:
+            irrelevant-files: *tempest-irrelevant-files
         - glance-multistore-cinder-import-fips:
+            voting: false
             irrelevant-files: *tempest-irrelevant-files
         - grenade:
             irrelevant-files: *tempest-irrelevant-files