diff options
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 18 | ||||
| -rw-r--r-- | utils/src/ooinstall/openshift_ansible.py | 2 |
2 files changed, 7 insertions, 13 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 65a481b10..1226242d0 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -25,21 +25,15 @@ QUIET_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible-quiet.cfg' DEFAULT_PLAYBOOK_DIR = '/usr/share/ansible/openshift-ansible/' UPGRADE_MAPPINGS = { - '3.4': { - 'minor_version': '3.4', - 'minor_playbook': 'v3_4/upgrade.yml', - 'major_playbook': 'v3_5/upgrade.yml', - 'major_version': '3.5', - }, - '3.5': { - 'minor_version': '3.5', - 'minor_playbook': 'v3_5/upgrade.yml', - 'major_playbook': 'v3_6/upgrade.yml', - 'major_version': '3.6', - }, '3.6': { 'minor_version': '3.6', 'minor_playbook': 'v3_6/upgrade.yml', + 'major_playbook': 'v3_7/upgrade.yml', + 'major_version': '3.7', + }, + '3.7': { + 'minor_version': '3.7', + 'minor_playbook': 'v3_7/upgrade.yml', }, } diff --git a/utils/src/ooinstall/openshift_ansible.py b/utils/src/ooinstall/openshift_ansible.py index ca5e7dc1a..1e2af2c61 100644 --- a/utils/src/ooinstall/openshift_ansible.py +++ b/utils/src/ooinstall/openshift_ansible.py @@ -281,7 +281,7 @@ def run_main_playbook(inventory_file, hosts, hosts_to_run_on, verbose=False): global CFG if len(hosts_to_run_on) != len(hosts): main_playbook_path = os.path.join(CFG.ansible_playbook_directory, - 'playbooks/byo/openshift-node/scaleup.yml') + 'playbooks/openshift-node/scaleup.yml') else: main_playbook_path = os.path.join(CFG.ansible_playbook_directory, 'playbooks/byo/openshift-cluster/config.yml') |