Revert "[Manila] Make grenade job voting"

This reverts commit c9aa2bc93c.
Because job has been broken by [1] and fix is not
merged yet [2]. It will unblock possibility to merge
changes to manila project.

[1] https://review.openstack.org/#/c/407502/
[2] https://review.openstack.org/#/c/411768/

Change-Id: I5d70dcabff416c6947fe11b18997b76ec05cf86e

jenkins/jobs/projects.yaml

@@ -6667,7 +6667,7 @@
             - 'ubuntu-xenial'
           pipeline: 'gate'
           branch-override: default
-          suffix: ''
+          suffix: '-nv'
       - 'gate-manila-tempest-minimal-dsvm-{driver}-{node}{suffix}':
           node:
             - 'ubuntu-trusty'

zuul/layout.yaml

@@ -11114,7 +11114,7 @@ projects:
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
-      - gate-grenade-dsvm-manila-ubuntu-xenial
+      - gate-grenade-dsvm-manila-ubuntu-xenial-nv
       - gate-rally-dsvm-manila-multibackend
       - gate-rally-dsvm-manila-multibackend-no-ss
       - gate-manila-ui-dsvm-nv
@@ -11125,7 +11125,6 @@ projects:
       - gate-manila-tempest-minimal-dsvm-dummy-ubuntu-xenial
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-trusty
       - gate-manila-tempest-minimal-dsvm-lvm-ubuntu-xenial
-      - gate-grenade-dsvm-manila-ubuntu-xenial
     post:
       - manila-coverage-db-ubuntu-trusty
       - manila-coverage-db-ubuntu-xenial