diff options
author | Samuel Munilla <smunilla@redhat.com> | 2016-03-07 14:18:35 -0500 |
---|---|---|
committer | Samuel Munilla <smunilla@redhat.com> | 2016-03-23 13:06:16 -0400 |
commit | eb369effbc557502b7c2ee58950391ae71b809c8 (patch) | |
tree | 7bb3ce320f9ecbd53d9fa3c6f448ffad8566d2e5 /utils/src/ooinstall/openshift_ansible.py | |
parent | ae78eb0bbe01edd97cd25f13adcce0bf38278ff3 (diff) | |
download | openshift-eb369effbc557502b7c2ee58950391ae71b809c8.tar.gz openshift-eb369effbc557502b7c2ee58950391ae71b809c8.tar.bz2 openshift-eb369effbc557502b7c2ee58950391ae71b809c8.tar.xz openshift-eb369effbc557502b7c2ee58950391ae71b809c8.zip |
a-o-i: Add 3.2 to list of supported versions
Diffstat (limited to 'utils/src/ooinstall/openshift_ansible.py')
-rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 16 |
1 files changed, 4 insertions, 12 deletions
diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index 2b95702bf..6e43eac9f 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -251,18 +251,10 @@ def run_uninstall_playbook(verbose=False): return run_ansible(playbook, inventory_file, facts_env, verbose) -def run_upgrade_playbook(old_version, new_version, verbose=False): - # TODO: do not hardcode the upgrade playbook, add ability to select the - # right playbook depending on the type of upgrade. - old_version = old_version.replace('.', '_') - new_version = old_version.replace('.', '_') - if old_version == new_version: - playbook = os.path.join(CFG.settings['ansible_playbook_directory'], - 'playbooks/byo/openshift-cluster/upgrades/v{}_minor/upgrade.yml'.format(new_version)) - else: - playbook = os.path.join(CFG.settings['ansible_playbook_directory'], - 'playbooks/byo/openshift-cluster/upgrades/v{}_to_v{}/upgrade.yml'.format(old_version, - new_version)) +def run_upgrade_playbook(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(CFG.hosts) facts_env = os.environ.copy() |