Merge pull request #1536 from smunilla/unattended_upgrades

a-o-i: Support for unattended upgrades

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()