From e957d5785b47f911a74984e5c53fea864b171a37 Mon Sep 17 00:00:00 2001
From: clime <clime@redhat.com>
Date: Tue, 14 Feb 2017 17:06:52 +0100
Subject: [PATCH] copr-backend: update provision configs for swapmounted
 ppc64le image

---
 .../files/provision/provision_builder_tasks_ppc64le.yml       | 4 +---
 .../backend/templates/provision/nova_cloud_vars_ppc64le.yml   | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml b/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml
index 9effa0fbcb..1b2e89dc0d 100644
--- a/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml
+++ b/roles/copr/backend/files/provision/provision_builder_tasks_ppc64le.yml
@@ -4,9 +4,6 @@
 - name: set bigger timeout for yum
   ini_file: dest=/etc/yum.conf section=main option=timeout value=1000
 
-- name: install distribution-gpg-keys which are right now not in fedora main
-  shell: dnf install -y https://kojipkgs.fedoraproject.org//packages/distribution-gpg-keys/1.5/1.fc24/noarch/distribution-gpg-keys-1.5-1.fc24.noarch.rpm
-
 - name: install pkgs
   yum: state=present pkg={{ item }}
   with_items:
@@ -63,6 +60,7 @@
 
 - name: symlink F26 configs to rawhide ones
   shell: for cfg in /etc/mock/fedora-rawhide-*.cfg; do ln -s $cfg `echo $cfg|sed 's/rawhide/26/'`; done
+  when: prepare_base_image is defined
 
 # 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
diff --git a/roles/copr/backend/templates/provision/nova_cloud_vars_ppc64le.yml b/roles/copr/backend/templates/provision/nova_cloud_vars_ppc64le.yml
index f7a7da1cfc..2a65936f9e 100644
--- a/roles/copr/backend/templates/provision/nova_cloud_vars_ppc64le.yml
+++ b/roles/copr/backend/templates/provision/nova_cloud_vars_ppc64le.yml
@@ -11,7 +11,7 @@ OS_PASSWORD_OLD: "{{ copr_nova_password|default('variable OS_PASSWORD_OLD is und
 OS_PASSWORD: "{{ copr_password|default('variable OS_PASSWORD is undefined')}}"
 
 
-image_name: "builder-f24-ppc64le"
+image_name: "builder-f24-ppc64le-swapmounted"
 flavor_name: "{{ copr_builder_flavor_name }}"
 network_name: "{{ copr_builder_network_name }}"
 key_name: "{{ copr_builder_key_name }}"