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/cli_installer.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/cli_installer.py')
| -rw-r--r-- | utils/src/ooinstall/cli_installer.py | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/utils/src/ooinstall/cli_installer.py b/utils/src/ooinstall/cli_installer.py index 85b4d29cb..81dda2ea4 100644 --- a/utils/src/ooinstall/cli_installer.py +++ b/utils/src/ooinstall/cli_installer.py @@ -25,6 +25,7 @@ installer_file_handler.setLevel(logging.DEBUG) installer_log.addHandler(installer_file_handler) DEFAULT_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible.cfg' +QUIET_ANSIBLE_CONFIG = '/usr/share/atomic-openshift-utils/ansible-quiet.cfg' DEFAULT_PLAYBOOK_DIR = '/usr/share/ansible/openshift-ansible/' UPGRADE_MAPPINGS = { @@ -883,6 +884,8 @@ def cli(ctx, unattended, configuration, ansible_playbook_directory, ansible_conf # If we're installed by RPM this file should exist and we can use it as our default: oo_cfg.settings['ansible_config'] = DEFAULT_ANSIBLE_CONFIG + oo_cfg.settings['ansible_quiet_config'] = QUIET_ANSIBLE_CONFIG + oo_cfg.settings['ansible_log_path'] = ctx.obj['ansible_log_path'] ctx.obj['oo_cfg'] = oo_cfg |