summaryrefslogtreecommitdiffstats
path: root/playbooks
diff options
context:
space:
mode:
authorJason DeTiberus <jdetiber@redhat.com>2016-01-29 14:30:20 -0500
committerJason DeTiberus <jdetiber@redhat.com>2016-02-01 11:49:12 -0500
commitc37ab310652231ba1d9af4e511807a3ec262e17b (patch)
tree4d24844e08e29bcf78ebd51c62865983233128cd /playbooks
parent3d3053062ee3bca175df6eb4dd66ff56237234ca (diff)
downloadopenshift-c37ab310652231ba1d9af4e511807a3ec262e17b.tar.gz
openshift-c37ab310652231ba1d9af4e511807a3ec262e17b.tar.bz2
openshift-c37ab310652231ba1d9af4e511807a3ec262e17b.tar.xz
openshift-c37ab310652231ba1d9af4e511807a3ec262e17b.zip
Multi-master fixes for provider playbooks
- set openshift_master_cluster_method=native for all cloud providers so bin/cluster will build the ha masters correctly
Diffstat (limited to '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 0b6edd70b..985642cde 100644
--- a/playbooks/aws/openshift-cluster/config.yml
+++ b/playbooks/aws/openshift-cluster/config.yml
@@ -14,3 +14,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'