Add compute host service to single-node functional job

Make default base devstack job to be single-node
Apply multinode modification in multinode job.

Change-Id: I0a211fac857d24f25cd4517d8a1d58c362118ba3

zuul.d/tobiko-devstack.yaml

@@ -17,6 +17,7 @@
     timeout: 7200
     vars:
       devstack_localrc:
+        MULTI_HOST: 0
         USE_PYTHON3: true
         NETWORK_API_EXTENSIONS: address-scope,agent,allowed-address-pairs,auto-allocated-topology,availability_zone,binding,default-subnetpools,dhcp_agent_scheduler,dns-domain-ports,dns-integration,dvr,empty-string-filtering,ext-gw-mode,external-net,extra_dhcp_opt,extraroute,filter-validation,fip-port-details,flavors,ip-substring-filtering,l3-flavors,l3-ha,l3_agent_scheduler,logging,metering,multi-provider,net-mtu,net-mtu-writable,network-ip-availability,network_availability_zone,pagination,port-security,project-id,provider,qos,qos-bw-minimum-ingress,qos-fip,quotas,quota_details,rbac-policies,router,router_availability_zone,security-group,port-mac-address-regenerate,port-security-groups-filtering,segment,service-type,sorting,standard-attr-description,standard-attr-revisions,standard-attr-segment,standard-attr-timestamp,standard-attr-tag,subnet_allocation,trunk,trunk-details,uplink-status-propagation
         # TOBIKO_KEYSTONE_USERNAME: tobiko
@@ -31,7 +32,7 @@
         h-api: true
         h-api-cfn: true
         h-eng: true
-        n-cpu: false
+        n-cpu: true
         # NOTE(slaweq): we need to enable it as "legacy" service because for Fedora job
         # it has to be disabled. If it would be disabled as "neutron-dns: false" then it
         # devstack would consider that neutron-legacy isn't used and would not load proper
@@ -75,26 +76,6 @@
         log: true
         yaml: true
         yml: true
-    group-vars:
-      subnode:
-        devstack_localrc:
-          USE_PYTHON3: true
-        devstack_plugins:
-          neutron: git://opendev.org/openstack/neutron.git
-        devstack_services:
-          tempest: false
-          heat: false
-          h-api: false
-          h-api-cfn: false
-          h-eng: false
-          n-api-meta: false
-          n-cpu: true
-          placement-client: true
-          neutron-agent: true
-          c-vol: true
-          peakmem_tracker: true
-          dstat: true
-          tls-proxy: false
 
     run: playbooks/tobiko-devstack.yaml
     post-run: playbooks/post-tobiko-devstack.yaml
@@ -125,14 +106,27 @@
     description: |
       Base Tobiko devstack job with multinode.
     vars:
+      topology: multinode
       devstack_localrc:
         ENABLE_FILE_INJECTION: true
         MULTI_HOST: 1
-      topology: multinode
+      devstack_services:
+        n-cpu: false
     group-vars:
       subnode:
-        devstack_localrc:
-          MULTI_HOST: 1
+        devstack_services:
+          heat: false
+          h-api: false
+          h-api-cfn: false
+          h-eng: false
+          n-api-meta: false
+          placement-client: true
+          n-cpu: true
+          neutron-agent: true
+          c-vol: true
+          peakmem_tracker: true
+          dstat: true
+          tls-proxy: false
 
 
 - job:
@@ -153,11 +147,8 @@
     nodeset: openstack-three-node-centos-7
     vars:
       devstack_localrc:
+        # CentOS has no support for Python3
         USE_PYTHON3: false
-    group-vars:
-      subnode:
-        devstack_localrc:
-          USE_PYTHON3: false
 
 
 - job: