Shorten the name of the kolla-kubernetes gates

I left out kubernetes in the gate namei initially.  Adding it
in makes the gate name quite long.  This will shorten it a little.

Also dropped the Ubuntu binary gate for now.  Kolla-kubernetes
doesn't need it just yet.

Change-Id: Ic2525861e0423f115a449c7f7a0704b42ec1fcdc

jenkins/jobs/kolla-kubernetes.yaml

@@ -1,5 +1,5 @@
 - job-template:
-    name: '{pipeline}-kolla-kubernetes-dsvm-{action}-{distro}-{type}'
+    name: '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}'
     node: '{node}'
 
     wrappers:

jenkins/jobs/projects.yaml

@@ -3052,25 +3052,19 @@
       - pypi-jobs
       - openstack-publish-jobs
       - openstack-releasenotes-jobs
-      - '{pipeline}-kolla-kubernetes-dsvm-{action}-{distro}-{type}':
+      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}':
           action: deploy
           distro: centos
           node: 'centos-7'
           pipeline: gate
           type: binary
-      - '{pipeline}-kolla-kubernetes-dsvm-{action}-{distro}-{type}':
+      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}':
           action: deploy
           distro: centos
           node: 'centos-7'
           pipeline: gate
           type: source
-      - '{pipeline}-kolla-kubernetes-dsvm-{action}-{distro}-{type}':
-          action: deploy
-          distro: ubuntu
-          node: ubuntu-trusty
-          pipeline: gate
-          type: binary
-      - '{pipeline}-kolla-kubernetes-dsvm-{action}-{distro}-{type}':
+      - '{pipeline}-kolla-kubernetes-{action}-{distro}-{type}':
           action: deploy
           distro: ubuntu
           node: ubuntu-trusty

zuul/layout.yaml

@@ -2494,16 +2494,13 @@ jobs:
   - name: gate-kolla-dsvm-deploy-oraclelinux-source
     voting: false
 
-  - name: gate-kolla-kubernetes-dsvm-deploy-centos-binary
+  - name: gate-kolla-kubernetes-deploy-centos-binary
     voting: false
 
-  - name: gate-kolla-kubernetes-dsvm-deploy-centos-source
+  - name: gate-kolla-kubernetes-deploy-centos-source
     voting: false
 
-  - name: gate-kolla-kubernetes-dsvm-deploy-ubuntu-binary
-    voting: false
-
-  - name: gate-kolla-kubernetes-dsvm-deploy-ubuntu-source
+  - name: gate-kolla-kubernetes-deploy-ubuntu-source
     voting: false
 
   - name: ^(gate-)?devstack-docs
@@ -7264,10 +7261,9 @@ projects:
       - name: publish-to-pypi
       - name: release-notes-jobs
     check:
-      - gate-kolla-dsvm-deploy-centos-binary
-      - gate-kolla-dsvm-deploy-centos-source
-      - gate-kolla-dsvm-deploy-ubuntu-binary
-      - gate-kolla-dsvm-deploy-ubuntu-source
+      - gate-kolla-kubernetes-deploy-centos-binary
+      - gate-kolla-kubernetes-deploy-centos-source
+      - gate-kolla-kubernetes-deploy-ubuntu-source
 
   - name: openstack/kosmos
     template: