From 5f58db6ceff3c37252d5f955064df9a695e6a624 Mon Sep 17 00:00:00 2001 From: Rich Megginson Date: Fri, 2 Dec 2016 12:33:00 -0700 Subject: preserve the oo-install ansible_inventory_path value --- utils/src/ooinstall/oo_config.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'utils/src/ooinstall') 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 = [] -- cgit v1.2.3