[ansible] Moved to the correct location

commit c71da45c07ccc60a70a1d4151d16a174e240fc53 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Nov 8 19:34:21 2016 +0100 Moved to the correct location files/hotfix/fas/{ => templates}/error.html | 0 files/hotfix/fas/{ => templates}/home.html | 0 files/hotfix/fas/{ => templates}/login.html | 0 files/hotfix/fas/{ => templates}/welcome.html | 0 roles/ansible-server/templates/ansible.cfg.j2 | 6 +++++- 5 files changed, 5 insertions(+), 1 deletions(-) --- diff --git a/files/hotfix/fas/error.html b/files/hotfix/fas/templates/error.html similarity index 100% rename from files/hotfix/fas/error.html rename to files/hotfix/fas/templates/error.html diff --git a/files/hotfix/fas/home.html b/files/hotfix/fas/templates/home.html similarity index 100% rename from files/hotfix/fas/home.html rename to files/hotfix/fas/templates/home.html diff --git a/files/hotfix/fas/login.html b/files/hotfix/fas/templates/login.html similarity index 100% rename from files/hotfix/fas/login.html rename to files/hotfix/fas/templates/login.html diff --git a/files/hotfix/fas/welcome.html b/files/hotfix/fas/templates/welcome.html similarity index 100% rename from files/hotfix/fas/welcome.html rename to files/hotfix/fas/templates/welcome.html diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2 index cea9069..7242eab 100644 --- a/roles/ansible-server/templates/ansible.cfg.j2 +++ b/roles/ansible-server/templates/ansible.cfg.j2 @@ -24,6 +24,10 @@ poll_interval = 15 #remote_port = 22 #module_lang = C +# We don't always want to be required to specify a name to get useful info +# https://github.com/ansible/ansible/issues/14554 +display_args_to_stdout = True + # plays will gather facts by default, which contain information about # the remote system. # @@ -33,7 +37,7 @@ poll_interval = 15 gathering = smart # additional paths to search for roles in, colon separated -roles_path = {{ ansible_base }}/ansible/roles +roles_path = {{ ansible_base }}/ansible/roles:{{ ansible_base }}/openshift-ansible/roles # uncomment this to disable SSH key host checking #host_key_checking = False