summaryrefslogtreecommitdiffstats
path: root/utils
diff options
context:
space:
mode:
authorAndrew Butcher <abutcher@redhat.com>2017-11-16 15:49:17 -0500
committerRussell Teague <rteague@redhat.com>2017-12-05 14:02:23 -0500
commit259272fa2359fd4d3bd78291bd0b06a1261c4b01 (patch)
treed8ea0b2afe7df6c400160c7b2f3870f9e44bc6a8 /utils
parent968f614e984da91a4e883a9642af8e66d49d87a0 (diff)
downloadopenshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.gz
openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.bz2
openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.tar.xz
openshift-259272fa2359fd4d3bd78291bd0b06a1261c4b01.zip
Remove all references to pacemaker (pcs, pcsd) and openshift.master.cluster_method.
With pacemaker removed there is no longer a need for openshift.master.cluster_method. We only have one option.
Diffstat (limited to 'utils')
-rw-r--r--utils/src/ooinstall/openshift_ansible.py2
1 files changed, 0 insertions, 2 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 1e2af2c61..dda8eb4c6 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -125,7 +125,6 @@ def write_inventory_vars(base_inventory, lb):
base_inventory.write('openshift_override_hostname_check=true\n')
if lb is not None:
- base_inventory.write('openshift_master_cluster_method=native\n')
base_inventory.write("openshift_master_cluster_hostname={}\n".format(lb.hostname))
base_inventory.write(
"openshift_master_cluster_public_hostname={}\n".format(lb.public_hostname))
@@ -266,7 +265,6 @@ def default_facts(hosts, verbose=False):
facts_env = os.environ.copy()
facts_env["OO_INSTALL_CALLBACK_FACTS_YAML"] = CFG.settings['ansible_callback_facts_yaml']
facts_env["ANSIBLE_CALLBACK_PLUGINS"] = CFG.settings['ansible_plugins_directory']
- facts_env["OPENSHIFT_MASTER_CLUSTER_METHOD"] = 'native'
if 'ansible_log_path' in CFG.settings:
facts_env["ANSIBLE_LOG_PATH"] = CFG.settings['ansible_log_path']
if 'ansible_config' in CFG.settings: