Change compute generation from rack

Change-Id: I02bf9efc6fce6590fbfc8c31e1878c3c1ee0775b
diff --git a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
index 9cf1366..7c01fe1 100644
--- a/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
+++ b/tcp_tests/templates/cookied-bm-mcp-pike-k8s-contrail/lab04-upgrade-physical-inventory.yaml
@@ -81,28 +81,39 @@
           role: single_vlan_ctl
           single_address: 10.167.8.237
 
-    cmp001.bm-mcp-pike-k8s-contrail.local:
-      reclass_storage_name: kubernetes_compute_node001
+    cmp<<count>>:
+      reclass_storage_name: kubernetes_compute_rack01
       roles:
-      - linux_system_codename_xenial
       - kubernetes_compute_contrail
+      - linux_system_codename_xenial
       - salt_master_host
       interfaces:
         enp9s0f0:
           role: single_dhcp
         ens11f1:
           role: k8s_oc40_only_vhost_on_control_vlan
-          single_address: 10.167.8.103
-
-    cmp002.bm-mcp-pike-k8s-contrail.local:
-      reclass_storage_name: kubernetes_compute_node002
-      roles:
-      - linux_system_codename_xenial
-      - kubernetes_compute_contrail
-      - salt_master_host
-      interfaces:
-        enp9s0f0:
-          role: single_dhcp
-        ens11f1:
-          role: k8s_oc40_only_vhost_on_control_vlan
-          single_address: 10.167.8.104
+          #    cmp001.bm-mcp-pike-k8s-contrail.local:
+          #      reclass_storage_name: kubernetes_compute_node001
+          #      roles:
+          #      - linux_system_codename_xenial
+          #      - kubernetes_compute_contrail
+          #      - salt_master_host
+          #      interfaces:
+          #        enp9s0f0:
+          #          role: single_dhcp
+          #        ens11f1:
+          #          role: k8s_oc40_only_vhost_on_control_vlan
+          #          single_address: 10.167.8.103
+          #
+          #    cmp002.bm-mcp-pike-k8s-contrail.local:
+          #      reclass_storage_name: kubernetes_compute_node002
+          #      roles:
+          #      - linux_system_codename_xenial
+          #      - kubernetes_compute_contrail
+          #      - salt_master_host
+          #      interfaces:
+          #        enp9s0f0:
+          #          role: single_dhcp
+          #        ens11f1:
+          #          role: k8s_oc40_only_vhost_on_control_vlan
+          #          single_address: 10.167.8.104