a-o-i: Prompts to allow minor upgrades

Updates to the upgrade command to allow the user to select a minor
upgrade.

1 files changed, 9 insertions, 3 deletions

diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py
index 042ce1023..ec49c9601 100644
--- a/utils/src/ooinstall/openshift_ansible.py
+++ b/utils/src/ooinstall/openshift_ansible.py
@@ -237,11 +237,17 @@ def run_uninstall_playbook(verbose=False):
     return run_ansible(playbook, inventory_file, facts_env, verbose)
 
 
-def run_upgrade_playbook(verbose=False):
+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.
-    playbook = os.path.join(CFG.settings['ansible_playbook_directory'],
-        'playbooks/byo/openshift-cluster/upgrades/v3_0_to_v3_1/upgrade.yml')
+    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))
     # TODO: Upgrade inventory for upgrade?
     inventory_file = generate_inventory(CFG.hosts)
     facts_env = os.environ.copy()