Remove extra ansible.cfg

etc/ansible-quiet.cfg

@@ -1,33 +0,0 @@
-# config file for ansible -- http://ansible.com/
-# ==============================================
-
-# This config file provides examples for running
-# the OpenShift playbooks with the provided
-# inventory scripts. Only global defaults are
-# left uncommented
-
-[defaults]
-# Add the roles directory to the roles path
-roles_path = roles/
-
-# Set the log_path
-log_path = /tmp/ansible.log
-
-forks = 10
-host_key_checking = False
-nocows = 1
-
-retry_files_enabled = False
-
-deprecation_warnings=False
-
-# Need to handle:
-# inventory - derive from OO_ANSIBLE_DIRECTORY env var
-# callback_plugins - derive from pkg_resource.resource_filename
-# private_key_file - prompt if missing
-# remote_tmp - set if provided by user (cli)
-# ssh_args - set if provided by user (cli)
-# control_path
-
-callback_plugins = /usr/share/ansible/openshift-ansible/roles/lib_utils/callback_plugins
-stdout_callback = openshift_quick_installer

etc/ansible.cfg

@@ -1,40 +0,0 @@
-# config file for ansible -- http://ansible.com/
-# ==============================================
-
-# This config file provides examples for running
-# the OpenShift playbooks with the provided
-# inventory scripts. Only global defaults are
-# left uncommented
-
-[defaults]
-# Add the roles directory to the roles path
-roles_path = roles/
-
-# Set the log_path
-log_path = /tmp/ansible.log
-
-forks = 10
-host_key_checking = False
-nocows = 1
-
-retry_files_enabled = False
-
-deprecation_warnings = False
-
-# Need to handle:
-# inventory - derive from OO_ANSIBLE_DIRECTORY env var
-# callback_plugins - derive from pkg_resource.resource_filename
-# private_key_file - prompt if missing
-# remote_tmp - set if provided by user (cli)
-# ssh_args - set if provided by user (cli)
-# control_path
-
-[inventory]
-# fail more helpfully when the inventory file does not parse (Ansible 2.4+)
-unparsed_is_failed=true
-
-# Additional ssh options for OpenShift Ansible
-[ssh_connection]
-# shorten the ControlPath which is often too long; when it is,
-# ssh connection reuse silently fails, making everything slower.
-control_path = %(directory)s/%%h-%%r

openshift-ansible.spec

@@ -48,8 +48,7 @@ for Openshift and Atomic Enterprise.
 mkdir -p %{buildroot}%{_datadir}/%{name}
 mkdir -p %{buildroot}%{_datadir}/ansible/%{name}/inventory
 cp -rp inventory/dynamic %{buildroot}%{_datadir}/ansible/%{name}/inventory
-cp etc/ansible.cfg %{buildroot}%{_datadir}/ansible/%{name}/ansible.cfg
-cp etc/ansible-quiet.cfg %{buildroot}%{_datadir}/ansible/%{name}/ansible-quiet.cfg
+cp ansible.cfg %{buildroot}%{_datadir}/ansible/%{name}/ansible.cfg
 
 # openshift-ansible-bin install
 mkdir -p %{buildroot}%{_bindir}
@@ -89,7 +88,6 @@ touch %{buildroot}%{_datadir}/ansible/%{name}/roles/contiv/.empty_dir
 %{_datadir}/ansible/%{name}/inventory/dynamic
 %ghost %{_datadir}/ansible/%{name}/playbooks/common/openshift-master/library.rpmmoved
 %{_datadir}/ansible/%{name}/ansible.cfg
-%{_datadir}/ansible/%{name}/ansible-quiet.cfg
 
 # ----------------------------------------------------------------------------------
 # openshift-ansible-docs subpackage