diff options
Diffstat (limited to 'utils')
| -rw-r--r-- | utils/etc/ansible.cfg | 4 | ||||
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 18 | ||||
| -rw-r--r-- | utils/src/ooinstall/oo_config.py | 6 |
3 files changed, 14 insertions, 14 deletions
diff --git a/utils/etc/ansible.cfg b/utils/etc/ansible.cfg index f7e6fe2ff..562f6544d 100644 --- a/utils/etc/ansible.cfg +++ b/utils/etc/ansible.cfg @@ -29,6 +29,10 @@ deprecation_warnings = False # ssh_args - set if provided by user (cli) # control_path +[inventory] +# fail more helpfully when the inventory file does not parse (Ansible 2.4+) +unparsed_is_failed=true + # Additional ssh options for OpenShift Ansible [ssh_connection] # shorten the ControlPath which is often too long; when it is, 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/oo_config.py b/utils/src/ooinstall/oo_config.py index c3501c018..9ecd63a80 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -220,6 +220,7 @@ class OOConfig(object): persisted_value = loaded_config.get(setting) if persisted_value is not None: self.settings[setting] = str(persisted_value) + installer_log.debug("config: set (%s) to value (%s)", setting, persisted_value) # We've loaded any persisted configs, let's verify any # paths which are required for a correct and complete @@ -344,8 +345,9 @@ class OOConfig(object): if 'ansible_ssh_user' not in self.settings: self.settings['ansible_ssh_user'] = '' - self.settings['ansible_inventory_path'] = \ - '{}/hosts'.format(os.path.dirname(self.config_path)) + if 'ansible_inventory_path' not in self.settings: + self.settings['ansible_inventory_path'] = \ + '{}/hosts'.format(os.path.dirname(self.config_path)) # clean up any empty sets empty_keys = [] |