Merge pull request #1309 from detiber/multi-master

Multi-master fixes for provider playbooks

playbooks/aws/openshift-cluster/config.yml

@@ -13,3 +13,4 @@
     openshift_router_selector: 'type=infra'
     openshift_infra_nodes: "{{ g_infra_hosts }}"
     openshift_node_labels: '{"region": "{{ ec2_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"] }}"}'
+    openshift_master_cluster_method: 'native'

playbooks/gce/openshift-cluster/config.yml

@@ -15,3 +15,4 @@
     openshift_hostname: "{{ gce_private_ip }}"
     openshift_router_selector: 'type=infra'
     openshift_infra_nodes: "{{ g_infra_hosts }}"
+    openshift_master_cluster_method: 'native'

playbooks/libvirt/openshift-cluster/config.yml

@@ -15,3 +15,4 @@
     openshift_deployment_type: "{{ deployment_type }}"
     openshift_router_selector: 'type=infra'
     openshift_infra_nodes: "{{ g_infra_hosts }}"
+    openshift_master_cluster_method: 'native'

playbooks/openstack/openshift-cluster/config.yml

@@ -13,3 +13,4 @@
     openshift_hostname: "{{ ansible_default_ipv4.address }}"
     openshift_router_selector: 'type=infra'
     openshift_infra_nodes: "{{ g_infra_hosts }}"
+    openshift_master_cluster_method: 'native'