Refactor openshift services for composable roles

Introduce an openshift_node template that serves as base for all
openshift services. This reworks the inventory files so that hosts are
defined once and made part of the appropriate groups.

The master node can now be split from the infra node, or bundled
together with the Worker in the all-in-one role.

Provide environment files to enable the Master, Worker, Infra or
all-in-one role individually.

Change-Id: I9ad86185b01c88b609d320e2384c5644bd99bdae

extraconfig/services/openshift-master.yaml

@@ -39,10 +39,6 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  OpenShiftGlobalVariables:
-    default: {}
-    description: Global Ansible variables for OpenShift-Ansible installer.
-    type: json
   OpenShiftAnsiblePlaybook:
     default: '/usr/share/ansible/openshift-ansible/playbooks/deploy_cluster.yml'
     description: Path to OpenShift-Ansible playbook.
@@ -51,18 +47,23 @@ parameters:
     default: '/usr/share/ansible/openshift-ansible/playbooks/openshift-master/scaleup.yml'
     description: Path to OpenShift-Ansible playbook.
     type: string
+  OpenShiftWorkerScaleupPlaybook:
+    default: '/usr/share/ansible/openshift-ansible/playbooks/openshift-node/scaleup.yml'
+    description: Path to OpenShift-Ansible playbook.
+    type: string
   OpenShiftUpgradePlaybook:
     default: '/usr/share/ansible/openshift-ansible/playbooks/byo/openshift-cluster/upgrades/v3_9/upgrade.yml'
     description: Path to OpenShift-Ansible Upgrade playbook.
     type: string
+  OpenShiftGlobalVariables:
+    default: {}
+    description: Global Ansible variables for OpenShift-Ansible installer.
+    type: json
+  # TODO(mandre) Add as a inventory group var
   OpenShiftMasterNodeVars:
     default: {}
     description: OpenShift node vars specific for the master nodes
     type: json
-  OpenShiftWorkerNodeVars:
-    default: {}
-    description: OpenShift node vars specific for the worker nodes
-    type: json
   DockerInsecureRegistryAddress:
     description: Optional. The IP Address and Port of an insecure docker
                  namespace that will be configured in /etc/sysconfig/docker.
@@ -82,13 +83,26 @@ parameters:
     description: etcd container image for openshift
     type: string
 
+resources:
+
+  OpenShiftNode:
+      type: ./openshift-node.yaml
+      properties:
+        EndpointMap: {get_param: EndpointMap}
+        ServiceNetMap: {get_param: ServiceNetMap}
+        DefaultPasswords: {get_param: DefaultPasswords}
+        RoleName: {get_param: RoleName}
+        RoleParameters: {get_param: RoleParameters}
+
 outputs:
   role_data:
     description: Role data for the Openshift Service
     value:
       service_name: openshift_master
       config_settings:
-        tripleo.openshift_master.firewall_rules:
+        map_merge:
+          - get_attr: [OpenShiftNode, role_data, config_settings]
+          - tripleo.openshift_master.firewall_rules:
               '200 openshift-master api':
                 dport: 6443
                 proto: tcp
@@ -100,17 +114,12 @@ outputs:
       upgrade_tasks: []
       step_config: ''
       external_deploy_tasks:
-        - name: openshift_master step 2
+        list_concat:
+          - get_attr: [OpenShiftNode, role_data, external_deploy_tasks]
+          - - name: openshift_master step 2
               when: step == '2'
               tags: openshift
               block:
-            - name: create openshift temp dirs
-              file:
-                path: "{{item}}"
-                state: directory
-              with_items:
-                - "{{playbook_dir}}/openshift/inventory"
-
                 - name: set openshift global vars fact
                   set_fact:
                     openshift_global_vars:
@@ -150,29 +159,27 @@ outputs:
                         osm_image: {get_param: DockerOpenShiftBaseImage}
                         osn_image: {get_param: DockerOpenShiftNodeImage}
                         openshift_cockpit_deployer_image: {get_param: DockerOpenShiftCockpitImage}
-                    openshift_web_console_prefix:
-                      yaql:
-                        expression:
-                          $.data.image.rightSplit(":", 1)[0] + "-"
-                        data:
-                          image: {get_param: DockerOpenShiftBaseImage}
                         openshift_docker_additional_registries: {get_param: DockerInsecureRegistryAddress}
                         openshift_master_bootstrap_auto_approve: true
                         osm_controller_args: {"experimental-cluster-signing-duration": ["20m"]}
                       - {get_param: OpenShiftGlobalVariables}
-                tripleo_role_name: {get_param: RoleName}
                     tripleo_stack_action: {get_param: StackAction}
                     openshift_master_node_vars: {get_param: OpenShiftMasterNodeVars}
-                openshift_worker_node_vars: {get_param: OpenShiftWorkerNodeVars}
-                openshift_master_network: {get_param: [ServiceNetMap, OpenshiftMasterNetwork]}
 
-            # NOTE(flaper87): Check if origin-node is running
+                - name: set role facts for generating inventory
-            # in the openshift nodes so we can flag the node
+                  set_fact:
-            # as new later on.
+                    tripleo_role_name: {get_param: RoleName}
-            # This task ignores errors because docker inspect
+
-            # exits with 1 if origin-node doesn't exist. Perhaps
+                # FIXME(mandre) This task always fails:
-            # we could use failed_when instead of ignoring the
+                # - become:true doesn't work in that context (containerized undercloud issue?)
-            # errors. Future improvement.
+                # - there is no origin-master-api docker container
+                # We should be checking for systemd service status instead.
+                # NOTE(flaper87): Check if origin-node is running in the openshift
+                # nodes so we can flag the node as new later on.
+                #
+                # This task ignores errors because docker inspect exits with 1 if
+                # origin-node doesn't exist. Perhaps we could use failed_when
+                # instead of ignoring the errors. Future improvement.
                 - name: Check if origin-node is running
                   become: true
                   shell: >
@@ -183,36 +190,16 @@ outputs:
                   delegate_to: "{{item}}"
                   with_items: "{{ groups[tripleo_role_name] | default([]) }}"
 
-              # NOTE(flaper87): Create all the nodes objects
-              # now, as yaml dicts, instead of formatting
-              # everything as part of a template.
-              # We consider new_node all the nodes that
-              # exited with 1 in the previous task.
-              #
-              # Future Improvement: Use hostvars[] syntax
-              # instead of raw_get to reduce verbosity.
                 - set_fact:
                     nodes:
                       - new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
                         hostname: "{{item}}"
-                    ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
-                    ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
-                    ansible_become: true
-                    containerized: true
-                    openshift_node_group_name: 'node-config-master-infra'
-                    etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_master_bind_addr: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
-
                   register: all_master_nodes
                   with_items: "{{groups[tripleo_role_name] | default([]) }}"
 
                 - set_fact:
                     master_nodes: "{{all_master_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | list}}"
-                new_masters: "{{all_master_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | selectattr('new_node', 'equalto', True) | list}}"
+                    new_master_nodes: "{{all_master_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | selectattr('new_node', 'equalto', True) | list}}"
 
                 # NOTE(flaper87): Every master node will be in the masters group
                 # but only new master nodes will be in the new_masters section, which
@@ -224,44 +211,48 @@ outputs:
                     dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_master.yml"
                     content: |
                       {% if master_nodes | count > 0%}
+                      all:
+                        children:
                           masters:
                             hosts:
-                    {% for host in master_nodes %}
+                              {% for host in master_nodes -%}
                               {{host.hostname}}:
-                        {{host | combine(openshift_master_node_vars) | to_nice_yaml() | indent(6)}}
                               {% endfor %}
 
-                  nodes:
+                            vars:
-                    hosts:
+                              {{openshift_master_node_vars | to_nice_yaml() | indent(6)}}
-                    {% for host in master_nodes %}
-                    {{host.hostname}}:
-                        {{host | combine(openshift_master_node_vars) | to_nice_yaml() | indent(6)}}
-                    {% endfor %}
-                  {% endif %}
 
-                  {% if new_masters | count > 0 %}
+                          {% if new_master_nodes | count > 0 -%}
                           new_masters:
                             hosts:
-                    {% for host in new_masters %}
+                              # FIXME(mandre)
+                              # patterns do not work in inventory files, so we
+                              # can't write something like
+                              #   hosts:
+                              #     new_nodes:&masters: {}
+                              #
+                              # Also impossible to register var with templated
+                              # name, we can't re-use the all_role_nodes var
+                              # for the master role in openshift-node.yaml
+                              {% for host in new_master_nodes -%}
                               {{host.hostname}}:
-                        {{host | combine(openshift_master_node_vars) | to_nice_yaml() | indent(6)}}
                               {% endfor %}
+                          {% endif %}
+                      {% endif %}
 
-                  new_nodes:
+                - name: generate openshift inventory for groups
-                    hosts:
+                  copy:
-                    {% for host in master_nodes %}
+                    dest: "{{playbook_dir}}/openshift/inventory/groups.yml"
-                    {{host.hostname}}:
+                    content: |
-                        {{host | combine(openshift_master_node_vars) | to_nice_yaml() | indent(6)}}
+                      all:
-                    {% endfor %}
+                        children:
+                          etcd:
+                            children:
+                              masters: {}
 
                           new_etcd:
                             children:
                               new_masters: {}
-                  {% endif %}
-
-                  etcd:
-                    children:
-                      masters: {}
 
                           OSEv3:
                             children:
@@ -289,6 +280,7 @@ outputs:
                   set_fact:
                     openshift_ansible_playbook_path: {get_param: OpenShiftAnsiblePlaybook}
                     openshift_master_scaleup_playbook_path: {get_param: OpenShiftMasterScaleupPlaybook}
+                    openshift_worker_scaleup_playbook_path: {get_param: OpenShiftWorkerScaleupPlaybook}
                     openshift_upgrade_playbook_path: {get_param: OpenShiftUpgradePlaybook}
 
                 # NOTE(flaper87): We'll use openshift_ansible_scaleup_playbook_path

extraconfig/services/openshift-node.yaml

@@ -0,0 +1,163 @@
+heat_template_version: rocky
+
+description: External tasks definition for OpenShift
+
+parameters:
+  StackAction:
+    type: string
+    description: >
+      Heat action on performed top-level stack.  Note StackUpdateType is
+      set to UPGRADE when a major-version upgrade is in progress.
+    constraints:
+    - allowed_values: ['CREATE', 'UPDATE']
+  RoleNetIpMap:
+    default: {}
+    type: json
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  OpenShiftNodeGroupName:
+    default: node-config-all-in-one
+    description: The group the nodes belong to.
+    type: string
+    tags:
+      - role_specific
+
+resources:
+  RoleParametersValue:
+    type: OS::Heat::Value
+    properties:
+      type: json
+      value:
+        map_replace:
+          - map_replace:
+            - OpenShiftNodeGroupName: OpenShiftNodeGroupName
+            - values: {get_param: [RoleParameters]}
+          - values:
+              OpenShiftNodeGroupName: {get_param: OpenShiftNodeGroupName}
+
+outputs:
+  role_data:
+    description: Role data for the Openshift Service
+    value:
+      service_name: openshift_node
+      config_settings: {}
+      upgrade_tasks: []
+      step_config: ''
+      external_deploy_tasks:
+        - name: openshift_node step 1
+          when: step == '1'
+          tags: openshift
+          block:
+            - name: create openshift temp dirs
+              file:
+                path: "{{item}}"
+                state: directory
+              with_items:
+                - "{{playbook_dir}}/openshift/inventory"
+
+            - name: set role facts for generating inventory
+              set_fact:
+                tripleo_role_name: {get_param: RoleName}
+                tripleo_node_group_name: {get_attr: [RoleParametersValue, value, OpenShiftNodeGroupName]}
+                openshift_master_network: {get_param: [ServiceNetMap, OpenshiftMasterNetwork]}
+
+            # FIXME(mandre) This task always fails:
+            # - become:true doesn't work in that context (containerized undercloud issue?)
+            # - there is no origin-master-api docker container
+            # We should be checking for systemd service status instead.
+            # NOTE(flaper87): Check if origin-node is running in the openshift
+            # nodes so we can flag the node as new later on.
+            #
+            # This task ignores errors because docker inspect exits with 1 if
+            # origin-node doesn't exist. Perhaps we could use failed_when
+            # instead of ignoring the errors. Future improvement.
+            - name: Check if origin-node is running
+              become: true
+              shell: >
+                docker inspect atomic-enterprise-master-api > /dev/null 2>&1
+                || docker inspect origin-master-api > /dev/null 2>&1
+                || echo "false"
+              register: origin_nodes
+              delegate_to: "{{item}}"
+              with_items: "{{ groups[tripleo_role_name] | default([]) }}"
+
+              # NOTE(flaper87): Create all the nodes objects
+              # now, as yaml dicts, instead of formatting
+              # everything as part of a template.
+              # We consider new_node all the nodes that
+              # exited with 1 in the previous task.
+            - set_fact:
+                nodes:
+                  - new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
+                    hostname: "{{item}}"
+                    ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
+                    ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
+                    ansible_become: true
+                    containerized: true
+                    openshift_node_group_name: '{{tripleo_node_group_name}}'
+                    etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_master_bind_addr: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
+                    openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
+              register: all_role_nodes
+              with_items: "{{groups[tripleo_role_name] | default([]) }}"
+
+            - set_fact:
+                role_nodes: "{{all_role_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | list}}"
+                new_role_nodes: "{{all_role_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | selectattr('new_node', 'equalto', True) | list}}"
+
+            - name: generate openshift inventory for {{tripleo_role_name}} role nodes
+              copy:
+                dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_nodes.yml"
+                content: |
+                  {% if role_nodes | count > 0%}
+                  all:
+                    hosts:
+                      {% for host in role_nodes -%}
+                      {{host.hostname}}:
+                        {{host | to_nice_yaml() | indent(6)}}
+                      {% endfor %}
+
+                    children:
+                      nodes:
+                        hosts:
+                          {% for host in role_nodes -%}
+                          {{host.hostname}}:
+                          {% endfor %}
+
+                      {% if new_role_nodes | count > 0 -%}
+                      new_nodes:
+                        hosts:
+                          {% for host in new_role_nodes -%}
+                          {{host.hostname}}:
+                          {% endfor %}
+
+                      {% endif %}
+
+                  {% endif %}

extraconfig/services/openshift-worker.yaml

@@ -32,40 +32,32 @@ parameters:
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
-  OpenShiftNodeGroupName:
+  # TODO(mandre) This is unused. Remove it or make it OpenShiftNodeVars
-    default: node-config-compute
+  OpenShiftWorkerNodeVars:
-    description: The group the nodes belong to.
+    default: {}
-    type: string
+    description: OpenShift node vars specific for the worker nodes
-    tags:
+    type: json
-      - role_specific
-  OpenShiftWorkerScaleupPlaybook:
-    default: '/usr/share/ansible/openshift-ansible/playbooks/openshift-node/scaleup.yml'
-    description: Path to OpenShift-Ansible playbook.
-    type: string
 
 resources:
-  RoleParametersValue:
+
-    type: OS::Heat::Value
+  OpenShiftNode:
+      type: ./openshift-node.yaml
       properties:
-      type: json
+        EndpointMap: {get_param: EndpointMap}
-      value:
+        ServiceNetMap: {get_param: ServiceNetMap}
-        map_replace:
+        DefaultPasswords: {get_param: DefaultPasswords}
-          - map_replace:
+        RoleName: {get_param: RoleName}
-            - OpenShiftNodeGroupName: OpenShiftNodeGroupName
+        RoleParameters: {get_param: RoleParameters}
-            - values: {get_param: [RoleParameters]}
-          - values:
-              OpenShiftNodeGroupName: {get_param: OpenShiftNodeGroupName}
 
 outputs:
   role_data:
     description: Role data for the Openshift Service
     value:
-      # This service template essentially tags the nodes that we want
-      # as workers. The actual installation is performed in
-      # openshift-master service template.
       service_name: openshift_worker
       config_settings:
-        tripleo.openshift_worker.firewall_rules:
+        map_merge:
+          - get_attr: [OpenShiftNode, role_data, config_settings]
+          - tripleo.openshift_worker.firewall_rules:
               '200 openshift-worker kubelet':
                 dport:
                   - 10250
@@ -76,73 +68,4 @@ outputs:
       upgrade_tasks: []
       step_config: ''
       external_deploy_tasks:
-        - name: openshift_worker step 1
+        - get_attr: [OpenShiftNode, role_data, external_deploy_tasks]
-          when: step == '1'
-          tags: openshift
-          block:
-            - name: create openshift temp dirs
-              file:
-                path: "{{item}}"
-                state: directory
-              with_items:
-                - "{{playbook_dir}}/openshift/inventory"
-
-            - name: set global vars facts
-              set_fact:
-                tripleo_role_name: {get_param: RoleName}
-                tripleo_node_group_name: {get_attr: [RoleParametersValue, value, OpenShiftNodeGroupName]}
-                openshift_master_network: {get_param: [ServiceNetMap, OpenshiftMasterNetwork]}
-                openshift_worker_scaleup_playbook_path: {get_param: OpenShiftWorkerScaleupPlaybook}
-
-            - name: Check if origin-node is running
-              become: true
-              shell: >
-                docker inspect atomic-enterprise-node > /dev/null 2>&1
-                || docker inspect origin-node > /dev/null 2>&1
-                || echo "false"
-              register: origin_nodes
-              delegate_to: "{{item}}"
-              with_items: "{{ groups[tripleo_role_name] | default([]) }}"
-
-            - set_fact:
-                nodes:
-                  - new_node: "{{origin_nodes.results | selectattr('item', 'equalto', item) | selectattr('stdout', 'equalto', 'false') | list | count > 0}}"
-                    hostname: "{{item}}"
-                    ansible_user: "{{ hostvars[item]['ansible_user'] | default(hostvars[item]['ansible_ssh_user']) | default('root') }}"
-                    ansible_host: "{{ hostvars[item]['ansible_host'] | default(item) }}"
-                    ansible_become: true
-                    containerized: true
-                    openshift_node_group_name: '{{tripleo_node_group_name }}'
-                    etcd_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_public_ip: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_public_hostname: "{{hostvars[item][openshift_master_network + '_ip']}}"
-                    openshift_schedulable: '{{tripleo_node_group_name != "node-config-infra"}}'
-              register: all_worker_nodes
-              with_items: "{{groups[tripleo_role_name] | default([]) }}"
-
-            - set_fact:
-                worker_nodes: "{{all_worker_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | list}}"
-                new_nodes: "{{all_worker_nodes.results | map(attribute='ansible_facts') | map(attribute='nodes') | flatten | selectattr('new_node', 'equalto', True) | list}}"
-
-            - copy:
-                dest: "{{playbook_dir}}/openshift/inventory/{{tripleo_role_name}}_openshift_worker.yml"
-                content: |
-                  {% if worker_nodes | count > 0 %}
-                  nodes:
-                    hosts:
-                    {% for host in worker_nodes %}
-                    {{host.hostname}}:
-                        {{host | to_nice_yaml() | indent(6)}}
-                    {% endfor %}
-                  {% endif %}
-
-                  {% if new_nodes | count > 0 %}
-                  new_nodes:
-                    hosts:
-                    {% for host in new_nodes %}
-                    {{host.hostname}}:
-                        {{host | to_nice_yaml() | indent(6)}}
-                    {% endfor %}
-                  {% endif %}

roles/OpenShiftAllInOne.yaml

@@ -0,0 +1,33 @@
+###############################################################################
+# Role: OpenShiftAllInOne                                                     #
+###############################################################################
+- name: OpenShiftAllInOne
+  description: |
+    OpenShiftAllInOne role
+  CountDefault: 1
+  RoleParametersDefault:
+    OpenShiftNodeGroupName: 'node-config-all-in-one'
+  tags:
+    - primary
+    - controller
+    - openshift
+  networks:
+    - External
+    - InternalApi
+    - Storage
+    - StorageMgmt
+    - Tenant
+  # For systems with both IPv4 and IPv6, you may specify a gateway network for
+  # each, such as ['ControlPlane', 'External']
+  default_route_networks: ['External']
+  ServicesDefault:
+    - OS::TripleO::Services::Docker
+    - OS::TripleO::Services::Sshd
+    - OS::TripleO::Services::Ntp
+    - OS::TripleO::Services::TripleoFirewall
+    - OS::TripleO::Services::TripleoPackages
+    - OS::TripleO::Services::HAproxy
+    - OS::TripleO::Services::Keepalived
+    - OS::TripleO::Services::OpenShift::Master
+    - OS::TripleO::Services::OpenShift::Worker
+    - OS::TripleO::Services::OpenShift::GlusterFS

roles/OpenShiftInfra.yaml

@@ -5,6 +5,8 @@
   description: |
     OpenShiftInfra role, a specialized worker that only runs infra pods.
   CountDefault: 1
+  RoleParametersDefault:
+    OpenShiftNodeGroupName: 'node-config-infra'
   tags:
     - openshift
   networks:
@@ -12,8 +14,6 @@
     - Storage
     - StorageMgmt
     - Tenant
-  RoleParametersDefault:
-    OpenShiftNodeGroupName: 'node-config-infra'
   # For systems with both IPv4 and IPv6, you may specify a gateway network for
   # each, such as ['ControlPlane', 'External']
   default_route_networks: ['ControlPlane']

roles/OpenShiftMaster.yaml

@@ -5,6 +5,8 @@
   description: |
     OpenShiftMaster role
   CountDefault: 1
+  RoleParametersDefault:
+    OpenShiftNodeGroupName: 'node-config-master'
   tags:
     - primary
     - controller

roles/OpenShiftWorker.yaml

@@ -5,6 +5,8 @@
   description: |
     OpenShiftWorker role
   CountDefault: 1
+  RoleParametersDefault:
+    OpenShiftNodeGroupName: 'node-config-compute'
   tags:
     - openshift
   networks: