diff options
| author | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:32:56 -0700 |
|---|---|---|
| committer | Tim Bielawa <tbielawa@redhat.com> | 2016-09-29 07:43:54 -0700 |
| commit | ba823255fcde17124b6dcc447bb00bc241346312 (patch) | |
| tree | f37bc298467beadf3e1d4a722702a346f14de75c /utils/src/ooinstall/oo_config.py | |
| parent | be3a68ae520d518daef2e35553c28cd150d3c344 (diff) | |
| download | openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.gz openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.bz2 openshift-ba823255fcde17124b6dcc447bb00bc241346312.tar.xz openshift-ba823255fcde17124b6dcc447bb00bc241346312.zip | |
Fix conflicts in spec file
Diffstat (limited to 'utils/src/ooinstall/oo_config.py')
| -rw-r--r-- | utils/src/ooinstall/oo_config.py | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/utils/src/ooinstall/oo_config.py b/utils/src/ooinstall/oo_config.py index 393b36f6f..ce0ae8deb 100644 --- a/utils/src/ooinstall/oo_config.py +++ b/utils/src/ooinstall/oo_config.py @@ -308,6 +308,12 @@ class OOConfig(object): if 'ansible_plugins_directory' not in self.settings: self.settings['ansible_plugins_directory'] = \ resource_filename(__name__, 'ansible_plugins') + installer_log.debug("We think the ansible plugins directory should be: %s (it is not already set)", + self.settings['ansible_plugins_directory']) + else: + installer_log.debug("The ansible plugins directory is already set: %s", + self.settings['ansible_plugins_directory']) + if 'version' not in self.settings: self.settings['version'] = 'v2' |