Switch papr to use our new composite groups

.papr.all-in-one.inventory

@@ -15,11 +15,6 @@ openshift_portal_net=172.30.0.0/16
 openshift_enable_service_catalog=false
 debug_level=4
 
-my_node_group1_labels=['node-role.kubernetes.io/master=true', 'node-role.kubernetes.io/infra=true', 'node-role.kubernetes.io/compute=true']
-my_node_group1={'name': 'node-config-all-in-one', 'labels': {{ my_node_group1_labels }} }
-
-openshift_node_groups=[{{ my_node_group1 }}]
-
 [all:vars]
 # bootstrap configs
 openshift_master_bootstrap_auto_approve=true

.papr.inventory

@@ -14,14 +14,6 @@ openshift_check_min_host_memory_gb=1.9
 openshift_portal_net=172.30.0.0/16
 debug_level=4
 
-my_node_group1_labels=['node-role.kubernetes.io/master=true', 'node-role.kubernetes.io/infra=true']
-my_node_group1={'name': 'node-config-infra-master', 'labels': {{ my_node_group1_labels }} }
-
-my_node_group2_labels=['node-role.kubernetes.io/compute=true']
-my_node_group2={'name': 'node-config-compute', 'labels': {{ my_node_group2_labels }} }
-
-openshift_node_groups=[{{ my_node_group1 }}, {{ my_node_group2 }}]
-
 [all:vars]
 # bootstrap configs
 openshift_master_bootstrap_auto_approve=true
@@ -36,6 +28,6 @@ ocp-master
 ocp-master
 
 [nodes]
-ocp-master openshift_schedulable=true openshift_node_group_name="node-config-infra-master"
+ocp-master openshift_schedulable=true openshift_node_group_name="node-config-master-infra"
 ocp-node1 openshift_node_group_name="node-config-infra" openshift_node_group_name="node-config-compute"
 ocp-node2 openshift_node_group_name="node-config-infra" openshift_node_group_name="node-config-compute"