Merge pull request #8731 from sdodson/nodegroupname-docs

Add master-infra and all-in-one node-configs

.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"

README.md

@@ -103,6 +103,11 @@ each node group defined in `openshift_node_groups` and they're named
 to note that the configmap is also the authoritative definition of node labels,
 the old `openshift_node_labels` value is effectively ignored.
 
+There are also two configmaps that label nodes into multiple roles, these are
+not recommended for production clusters, however they're named
+`node-config-all-in-one` and `node-config-master-infra` if you'd like to use
+them to deploy non production clusters.
+
 The default set of node groups is defined in
 [roles/openshift_facts/defaults/main.yml] like so
 
@@ -120,6 +125,14 @@ openshift_node_groups:
     labels:
       - 'node-role.kubernetes.io/compute=true'
     edits: []
+  - name: node-config-master-infra
+    labels:
+      - 'node-role.kubernetes.io/infra=true,node-role.kubernetes.io/master=true'
+    edits: []
+  - name: node-config-all-in-one
+    labels:
+      - 'node-role.kubernetes.io/infra=true,node-role.kubernetes.io/master=true,node-role.kubernetes.io/compute=true'
+    edits: []
 ```
 
 When configuring this in the INI based inventory this must be translated into a

roles/openshift_facts/defaults/main.yml

@@ -130,4 +130,12 @@ openshift_node_groups:
     labels:
       - 'node-role.kubernetes.io/compute=true'
     edits: []
+  - name: node-config-master-infra
+    labels:
+      - 'node-role.kubernetes.io/infra=true,node-role.kubernetes.io/master=true'
+    edits: []
+  - name: node-config-all-in-one
+    labels:
+      - 'node-role.kubernetes.io/infra=true,node-role.kubernetes.io/master=true,node-role.kubernetes.io/compute=true'
+    edits: []
 openshift_master_manage_htpasswd: True