From 04bb673626b308575a1d6a9b43ba22c82b40aafc Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 25 May 2016 16:28:05 +0000 Subject: [PATCH 1/2] Set handler includes to be static to make our included handlers work again. --- roles/ansible-server/templates/ansible.cfg.j2 | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/roles/ansible-server/templates/ansible.cfg.j2 b/roles/ansible-server/templates/ansible.cfg.j2 index 966d8da839..cea9069a51 100644 --- a/roles/ansible-server/templates/ansible.cfg.j2 +++ b/roles/ansible-server/templates/ansible.cfg.j2 @@ -43,6 +43,13 @@ roles_path = {{ ansible_base }}/ansible/roles # enable additional callbacks callback_whitelist = fedmsg_callback2,profile_tasks,logdetail2 +# Determine whether includes in tasks and handlers are "static" by +# default. As of 2.0, includes are dynamic by default. Setting these +# values to True will make includes behave more like they did in the +# 1.x versions. +#task_includes_static = True +handler_includes_static = True + # change this for alternative sudo implementations #sudo_exe = sudo From d8f55cd2b07a4236bc295dcc5e8b3193f230100e Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 25 May 2016 16:32:45 +0000 Subject: [PATCH 2/2] disable this for now to shave a few hours off master runs --- roles/copr/dist_git/tasks/main.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/copr/dist_git/tasks/main.yml b/roles/copr/dist_git/tasks/main.yml index 029203f7d0..86b0624f08 100644 --- a/roles/copr/dist_git/tasks/main.yml +++ b/roles/copr/dist_git/tasks/main.yml @@ -32,8 +32,8 @@ - name: create user for copr-git service user: name="copr-service" groups=apache,packager,mock generate_ssh_key=yes ssh_key_bits=2048 ssh_key_file=.ssh/id_rsa -- name: make sure directories are owned by copr-service user - shell: chown -R copr-service:copr-service /var/log/copr-dist-git +#- name: make sure directories are owned by copr-service user +# shell: chown -R copr-service:copr-service /var/log/copr-dist-git - name: make sure directories are owned by copr-service user shell: chown copr-service:copr-service {{ item }}