Merge pull request #2313 from mdanter/unschedulableMasterAsNode

In AWS where the master node was not part of the nodes and unschedulable

playbooks/aws/openshift-cluster/config.yml

@@ -30,7 +30,7 @@
     openshift_hosted_router_selector: 'type=infra'
     openshift_node_labels:
       region: "{{ deployment_vars[deployment_type].region }}"
-      type: "{{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] if inventory_hostname in groups['tag_host-type_node'] else hostvars[inventory_hostname]['ec2_tag_host-type'] }}"
+      type: "{{ hostvars[inventory_hostname]['ec2_tag_sub-host-type'] }}"
     openshift_master_cluster_method: 'native'
     openshift_use_openshift_sdn: "{{ lookup('oo_option', 'use_openshift_sdn') }}"
     os_sdn_network_plugin_name: "{{ lookup('oo_option', 'sdn_network_plugin_name') }}"