diff options
| author | Rich Megginson <rmeggins@redhat.com> | 2016-12-02 12:33:00 -0700 |
|---|---|---|
| committer | Rich Megginson <rmeggins@redhat.com> | 2017-05-18 21:20:11 -0600 |
| commit | 5f58db6ceff3c37252d5f955064df9a695e6a624 (patch) | |
| tree | c5bd61918f5862bf26e7dba74aa776941722fe90 /utils/src | |
| parent | be064f7be58d905874e8ebc34c8f270841b49887 (diff) | |
| download | openshift-5f58db6ceff3c37252d5f955064df9a695e6a624.tar.gz openshift-5f58db6ceff3c37252d5f955064df9a695e6a624.tar.bz2 openshift-5f58db6ceff3c37252d5f955064df9a695e6a624.tar.xz openshift-5f58db6ceff3c37252d5f955064df9a695e6a624.zip | |
preserve the oo-install ansible_inventory_path value
Diffstat (limited to 'utils/src')
| -rw-r--r-- | utils/src/ooinstall/oo_config.py | 6 |
1 files changed, 4 insertions, 2 deletions
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 = [] |