summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorOpenShift Merge Robot <openshift-merge-robot@users.noreply.github.com>2017-10-31 08:12:50 -0700
committerGitHub <noreply@github.com>2017-10-31 08:12:50 -0700
commit826455338b15c82cee16656b90e4689cf1b9a165 (patch)
treeb03aaac7ba3a5815384fab14a86c5400d6d9f6a6
parent9f28fd432b5eb9c69843c9450d451ddd27eabed6 (diff)
parent5f58db6ceff3c37252d5f955064df9a695e6a624 (diff)
downloadopenshift-826455338b15c82cee16656b90e4689cf1b9a165.tar.gz
openshift-826455338b15c82cee16656b90e4689cf1b9a165.tar.bz2
openshift-826455338b15c82cee16656b90e4689cf1b9a165.tar.xz
openshift-826455338b15c82cee16656b90e4689cf1b9a165.zip
Merge pull request #2910 from richm/preserve-ansible_inventory_path
Automatic merge from submit-queue. preserve the oo-install ansible_inventory_path value
-rw-r--r--utils/src/ooinstall/oo_config.py6
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 = []