Revert "copr builders: on F22 tell mock to use yum-deprecated"

yum isn't in the mock chroots and is breaking all builds for f22+

This reverts commit 2b1af001a40e1ff103259f911e308c630eefc0c7.

4 files changed, 4 insertions, 8 deletions

diff --git a/roles/copr/backend/files/provision/builderpb.yml b/roles/copr/backend/files/provision/builderpb.yml
index 49f1af569..39581eb76 100644
--- a/roles/copr/backend/files/provision/builderpb.yml
+++ b/roles/copr/backend/files/provision/builderpb.yml
@@ -36,7 +36,7 @@
 
 - hosts: builder_temp_group
   user: root
-  gather_facts: True
+  gather_facts: False
   vars:
    - files: files/
   
@@ -84,7 +84,7 @@
     action: authorized_key user=mockbuilder key='{{ lookup('file', '/home/copr/provision/files/buildsys.pub') }}'
 
   - name: put updated mock configs into /etc/mock
-    action: template src={{ files }}/mock/{{ item }} dest=/etc/mock
+    action: copy src={{ files }}/mock/{{ item }} dest=/etc/mock
     with_items:
     - site-defaults.cfg
 
diff --git a/roles/copr/backend/files/provision/builderpb_nova.yml b/roles/copr/backend/files/provision/builderpb_nova.yml
index 0cb5fe161..578cb11c0 100644
--- a/roles/copr/backend/files/provision/builderpb_nova.yml
+++ b/roles/copr/backend/files/provision/builderpb_nova.yml
@@ -32,7 +32,7 @@
 
 - name: provision builder
   hosts: builder_temp_group
-  gather_facts: True
+  gather_facts: False
   sudo: True
   user: fedora 
 
diff --git a/roles/copr/backend/files/provision/files/mock/site-defaults.cfg b/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
index 6213e56ee..477293365 100644
--- a/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
+++ b/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
@@ -22,7 +22,3 @@ config_opts['plugin_conf']['tmpfs_opts']['required_ram_mb'] = 1024
 config_opts['plugin_conf']['tmpfs_opts']['max_fs_size'] = '50g'
 config_opts['plugin_conf']['tmpfs_opts']['mode'] = '0755'
 config_opts['plugin_conf']['tmpfs_opts']['keep_mounted'] = False
-
-{% if ansible_distribution == 'Fedora' and ansible_distribution_major_version > 21 %}
-config_opts['yum_command'] = '/usr/bin/yum-deprecated'
-{% endif %}
diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
index b561bcf60..15fbc5ed7 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml
@@ -27,7 +27,7 @@
     - ca-certificates
 
 - name: put updated mock configs into /etc/mock
-  template: src=files/mock/{{ item }} dest=/etc/mock
+  copy: src=files/mock/{{ item }} dest=/etc/mock
   with_items:
     - site-defaults.cfg