Remove meta job map for aio->aio_lxc

The job map was only required to transition from pike to
queens when the scenario was changed.

The patch also correctly sets the scenario for the jobs
to the correct value.

Change-Id: I384df79df83b04adfd7ba002ce54b9044c6df5e1

zuul.d/jobs.yaml

@@ -81,7 +81,7 @@
     timeout: 10800
     vars:
       action: upgrade
-      scenario: aio
+      scenario: aio_lxc
 
 - job:
     name: openstack-ansible-deploy-aio_nspawn-ubuntu-xenial
@@ -139,7 +139,7 @@
     timeout: 10800
     vars:
       action: upgrade
-      scenario: aio
+      scenario: aio_lxc
 
 - job:
     name: openstack-ansible-deploy-aio_nspawn-centos-7
@@ -182,48 +182,10 @@
     timeout: 10800
     vars:
       action: upgrade
-      scenario: aio
+      scenario: aio_lxc
 
 - job:
     name: openstack-ansible-deploy-aio_nspawn-opensuse-423
     parent: openstack-ansible-deploy-aio_lxc-opensuse-423
     vars:
       scenario: aio_nspawn
-
-
-# NOTE(cloudnull): META JOB MAP
-# In order to cater for the possibility that an external job was dependent on the old job name
-# the following job items are used to repoint work to the updated job name should the old name
-# be referenced. As we updated our zuul dependencies and external job runners these items should
-# be removed as soon as they're no longer needed.
-- job:
-    name: openstack-ansible-varstest-aio-ubuntu-xenial
-    parent: openstack-ansible-varstest-aio_lxc-ubuntu-xenial
-
-- job:
-    name: openstack-ansible-deploy-aio-ubuntu-xenial
-    parent: openstack-ansible-deploy-aio
-
-- job:
-    name: openstack-ansible-upgrade-aio-ubuntu-xenial
-    parent: openstack-ansible-deploy-aio_lxc-ubuntu-xenial
-
-- job:
-    name: openstack-ansible-deploy-aio-centos-7
-    parent: openstack-ansible-deploy-aio_lxc-centos-7
-
-- job:
-    name: openstack-ansible-upgrade-aio-centos-7
-    parent: openstack-ansible-upgrade-aio_lxc-centos-7
-
-- job:
-    name: openstack-ansible-deploy-aio-opensuse-423
-    parent: openstack-ansible-deploy-aio_lxc-opensuse-423
-
-- job:
-    name: openstack-ansible-deploy-ceph-opensuse-423
-    parent: openstack-ansible-deploy-aio_lxc-opensuse-423
-
-- job:
-    name: openstack-ansible-upgrade-aio-opensuse-423
-    parent: openstack-ansible-deploy-aio_lxc-opensuse-423