summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStefanie Forrester <dak1n1@users.noreply.github.com>2016-02-01 08:51:18 -0800
committerStefanie Forrester <dak1n1@users.noreply.github.com>2016-02-01 08:51:18 -0800
commitd5cb285daf70dd44a3141a5d67ce972a65203a98 (patch)
tree2563bd9faa012e853ca690c98fa2f6063fa26956
parentb808eb073e53b0bd3910b75466ef32539a0250c9 (diff)
parentc37ab310652231ba1d9af4e511807a3ec262e17b (diff)
downloadopenshift-d5cb285daf70dd44a3141a5d67ce972a65203a98.tar.gz
openshift-d5cb285daf70dd44a3141a5d67ce972a65203a98.tar.bz2
openshift-d5cb285daf70dd44a3141a5d67ce972a65203a98.tar.xz
openshift-d5cb285daf70dd44a3141a5d67ce972a65203a98.zip
Merge pull request #1309 from detiber/multi-master
Multi-master fixes for provider playbooks
-rw-r--r--playbooks/aws/openshift-cluster/config.yml1
-rw-r--r--playbooks/gce/openshift-cluster/config.yml1
-rw-r--r--playbooks/libvirt/openshift-cluster/config.yml1
-rw-r--r--playbooks/openstack/openshift-cluster/config.yml1
4 files changed, 4 insertions, 0 deletions
diff --git a/playbooks/aws/openshift-cluster/config.yml b/playbooks/aws/openshift-cluster/config.yml
index b942db97f..33fcf6af5 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/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'
diff --git a/playbooks/gce/openshift-cluster/config.yml b/playbooks/gce/openshift-cluster/config.yml
index 80095d072..8bc9b1e53 100644
--- a/playbooks/gce/openshift-cluster/config.yml
+++ b/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'
diff --git a/playbooks/libvirt/openshift-cluster/config.yml b/playbooks/libvirt/openshift-cluster/config.yml
index b5cda6187..9bd99c4fc 100644
--- a/playbooks/libvirt/openshift-cluster/config.yml
+++ b/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'
diff --git a/playbooks/openstack/openshift-cluster/config.yml b/playbooks/openstack/openshift-cluster/config.yml
index 6618c6a7f..5128e767f 100644
--- a/playbooks/openstack/openshift-cluster/config.yml
+++ b/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'