summaryrefslogtreecommitdiffstats
path: root/playbooks/openstack
diff options
context:
space:
mode:
authorScott Dodson <sdodson@redhat.com>2017-12-05 15:42:20 -0500
committerGitHub <noreply@github.com>2017-12-05 15:42:20 -0500
commitb879f67881b1abcc8f614e1e6ca1b5cdc2cc2649 (patch)
treed8ea0b2afe7df6c400160c7b2f3870f9e44bc6a8 /playbooks/openstack
parent968f614e984da91a4e883a9642af8e66d49d87a0 (diff)
parent259272fa2359fd4d3bd78291bd0b06a1261c4b01 (diff)
downloadopenshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.gz
openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.bz2
openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.tar.xz
openshift-b879f67881b1abcc8f614e1e6ca1b5cdc2cc2649.zip
Merge pull request #6155 from abutcher/remove-pacemaker
Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
Diffstat (limited to 'playbooks/openstack')
-rw-r--r--playbooks/openstack/advanced-configuration.md1
-rw-r--r--playbooks/openstack/sample-inventory/group_vars/OSEv3.yml1
2 files changed, 0 insertions, 2 deletions
diff --git a/playbooks/openstack/advanced-configuration.md b/playbooks/openstack/advanced-configuration.md
index cb8af4a9e..f22243fbd 100644
--- a/playbooks/openstack/advanced-configuration.md
+++ b/playbooks/openstack/advanced-configuration.md
@@ -337,7 +337,6 @@ variables](https://docs.openshift.com/container-platform/3.6/install_config/inst
in `inventory/group_vars/OSEv3.yml`. For example, given a load balancer node
under the ansible group named `ext_lb`:
- openshift_master_cluster_method: native
openshift_master_cluster_hostname: "{{ groups.ext_lb.0 }}"
openshift_master_cluster_public_hostname: "{{ groups.ext_lb.0 }}"
diff --git a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
index 68d898d9a..933117127 100644
--- a/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
+++ b/playbooks/openstack/sample-inventory/group_vars/OSEv3.yml
@@ -6,7 +6,6 @@ openshift_deployment_type: origin
#openshift_release: v3.5
openshift_master_default_subdomain: "apps.{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}"
-openshift_master_cluster_method: native
openshift_master_cluster_public_hostname: "console.{{ openshift_openstack_clusterid }}.{{ openshift_openstack_public_dns_domain }}"
osm_default_node_selector: 'region=primary'