From 74b02ea28475c4738b5af275d382cfc33a6b082d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Miroslav=20Such=C3=BD?= <msuchy@redhat.com>
Date: Thu, 14 May 2015 17:31:08 +0200
Subject: [PATCH] typo

---
 inventory/group_vars/copr-back                |  2 +-
 inventory/group_vars/copr-back-stg            |  2 +-
 .../provision/files/mock/site-defaults.cfg    |  2 +-
 .../provision/provision_builder_tasks.yml     | 28 ++++---------------
 4 files changed, 8 insertions(+), 26 deletions(-)

diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back
index 1c6b0c420b..39f2c4d75c 100644
--- a/inventory/group_vars/copr-back
+++ b/inventory/group_vars/copr-back
@@ -6,7 +6,7 @@ copr_nova_tenant_id: "undefined_tenant_id"
 copr_nova_tenant_name: "copr"
 copr_nova_username: "copr"
 
-copr_builder_image_name: "builder_base_image_2015_04_01"
+copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
 copr_builder_flavor_name: "m1.builder"
 copr_builder_network_name: "copr-net"
 copr_builder_key_name: "buildsys"
diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg
index 7084af84cb..657809f3e5 100644
--- a/inventory/group_vars/copr-back-stg
+++ b/inventory/group_vars/copr-back-stg
@@ -6,7 +6,7 @@ copr_nova_tenant_id: "566a072fb1694950998ad191fee3833b"
 copr_nova_tenant_name: "coprdev"
 copr_nova_username: "copr"
 
-copr_builder_image_name: "builder_base_image_2015_04_01"
+copr_builder_image_name: "Fedora-Cloud-Base-20141203-21"
 copr_builder_flavor_name: "m1.builder"
 copr_builder_network_name: "coprdev-net"
 copr_builder_key_name: "buildsys"
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 f0f22274b0..4f72d4210e 100644
--- a/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
+++ b/roles/copr/backend/files/provision/files/mock/site-defaults.cfg
@@ -6,7 +6,7 @@ config_opts['plugin_conf']['ccache_enable'] = False
 config_opts['plugin_conf']['yum_cache_enable'] = True
 config_opts['plugin_conf']['yum_cache_opts']['max_age_days'] = 150
 config_opts['plugin_conf']['yum_cache_opts']['max_metadata_age_days'] = 150
-config_opts['plugin_conf']['yum_cache_opts']['dir'] = %(cache_topdir)s/%(root)s/%(package_manager)s_cache/"
+config_opts['plugin_conf']['yum_cache_opts']['dir'] = "%(cache_topdir)s/%(root)s/%(package_manager)s_cache/"
 config_opts['plugin_conf']['yum_cache_opts']['target_dir'] = "/var/cache/%(package_manager)s/"
 
 config_opts['plugin_conf']['root_cache_enable'] = False
diff --git a/roles/copr/backend/files/provision/provision_builder_tasks.yml b/roles/copr/backend/files/provision/provision_builder_tasks.yml
index 309bd29d12..fa1be2b80b 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks.yml
@@ -8,8 +8,8 @@
   yum: state=present pkg={{ item }}
   with_items:
     - dnf
-    - mock
-    - mock-lvm
+#    - mock
+#    - mock-lvm
     - createrepo
     - yum-utils
     - pyliblzma
@@ -19,6 +19,9 @@
     - libselinux-python
     - libsemanage-python
 
+- get_url: url=https://kojipkgs.fedoraproject.org//packages/mock/1.2.9/1.fc21/noarch/mock-1.2.9-1.fc21.noarch.rpm dest=/tmp/
+- yum: state=present name=/tmp/mock-1.2.9-1.fc21.noarch.rpm
+
 - name: make sure newest rpm
   # todo: replace with dnf after ansible 1.9 is available
   yum: name={{ item }} state=latest
@@ -26,7 +29,6 @@
     - rpm
     - glib2
     - ca-certificates
-    - https://kojipkgs.fedoraproject.org//packages/mock/1.2.9/1.fc21/noarch/mock-1.2.9-1.fc21.noarch.rpm
 
 - name: put updated mock configs into /etc/mock
   copy: src=files/mock/{{ item }} dest=/etc/mock
@@ -35,26 +37,6 @@
 
 # ansible doesn't support simultaneously usage of async and with_* options
 # it's not even planned for implementation, see https://github.com/ansible/ansible/issues/5841
-#- name: prepare caches
-#  when: prepare_base_image is defined
-#  async: 3600
-#  command: mock -r {{ item }} --init
-#  with_items:
-#    - epel-5-i386
-#    - epel-5-x86_64
-#    - epel-6-i386
-#    - epel-6-x86_64
-#    - epel-7-x86_64
-#    - fedora-20-i386
-#    - fedora-20-x86_64
-#    - fedora-21-i386
-#    - fedora-21-x86_64
-#    - fedora-22-i386
-#    - fedora-22-x86_64
-#    - fedora-rawhide-i386
-#    - fedora-rawhide-x86_64
-
-
 - name: prepare cache
   when: prepare_base_image is defined
   async: 3600