diff options
author | OpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com> | 2018-01-19 11:29:11 -0800 |
---|---|---|
committer | GitHub <noreply@github.com> | 2018-01-19 11:29:11 -0800 |
commit | 7efd4a3d1911763b9b76194683df014075d4bfd1 (patch) | |
tree | 760069668d5eff400e4709075f681f571b71b375 /utils/src/ooinstall/openshift_ansible.py | |
parent | 7411bdcabfce83e21273d32c67e88925dfccd2df (diff) | |
parent | 0678e7a3384b7cc1fb31cf136a203b94606ad0a9 (diff) | |
download | openshift-7efd4a3d1911763b9b76194683df014075d4bfd1.tar.gz openshift-7efd4a3d1911763b9b76194683df014075d4bfd1.tar.bz2 openshift-7efd4a3d1911763b9b76194683df014075d4bfd1.tar.xz openshift-7efd4a3d1911763b9b76194683df014075d4bfd1.zip |
Merge pull request #6789 from vrutkovs/quick-installer-disable-upgrade
Automatic merge from submit-queue.
Quick installer: deprecate upgrades
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 18 |
1 files changed, 0 insertions, 18 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index dda8eb4c6..216664cd0 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -321,21 +321,3 @@ def run_uninstall_playbook(hosts, verbose=False): facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_quiet_config'] return run_ansible(playbook, inventory_file, facts_env, verbose) - - -def run_upgrade_playbook(hosts, playbook, verbose=False): - playbook = os.path.join(CFG.settings['ansible_playbook_directory'], - 'playbooks/byo/openshift-cluster/upgrades/{}'.format(playbook)) - - # TODO: Upgrade inventory for upgrade? - inventory_file = generate_inventory(hosts) - facts_env = os.environ.copy() - if 'ansible_log_path' in CFG.settings: - facts_env['ANSIBLE_LOG_PATH'] = CFG.settings['ansible_log_path'] - if 'ansible_config' in CFG.settings: - facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_config'] - # override the ansible config for our main playbook run - if 'ansible_quiet_config' in CFG.settings: - facts_env['ANSIBLE_CONFIG'] = CFG.settings['ansible_quiet_config'] - - return run_ansible(playbook, inventory_file, facts_env, verbose) |