From 6f7fdf720ccd12595e5d16ba7a90b90b7f672cec Mon Sep 17 00:00:00 2001
From: Kevin Fenzi <kevin@scrye.com>
Date: Mon, 24 Aug 2015 16:28:26 +0000
Subject: [PATCH] Add the rest of the parts for owner sync:  koji config for
 root  hosts entry for arm hub  sync f21 not f20 now.

---
 roles/bodhi2/backend/files/koji-config          |  9 +++++++++
 roles/bodhi2/backend/tasks/main.yml             | 17 ++++++++++++++---
 ...bodhi-backend01.phx2.fedoraproject.org-hosts |  1 +
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 roles/bodhi2/backend/files/koji-config

diff --git a/roles/bodhi2/backend/files/koji-config b/roles/bodhi2/backend/files/koji-config
new file mode 100644
index 0000000000..2e8afcb7b3
--- /dev/null
+++ b/roles/bodhi2/backend/files/koji-config
@@ -0,0 +1,9 @@
+[koji]
+;client certificate
+cert = /etc/pki/pkgdb/pkgdb.pem
+
+;certificate of the CA that issued the client certificate
+ca = /etc/pki/pkgdb/fedora-server-ca.cert
+
+;certificate of the CA that issued the HTTP server certificate
+serverca = /etc/pki/pkgdb/fedora-server-ca.cert
diff --git a/roles/bodhi2/backend/tasks/main.yml b/roles/bodhi2/backend/tasks/main.yml
index b44b050040..6472c790c9 100644
--- a/roles/bodhi2/backend/tasks/main.yml
+++ b/roles/bodhi2/backend/tasks/main.yml
@@ -146,6 +146,17 @@
   tags:
   - config
 
+- name: create pki dir
+  file: path=/root/.koji mode=700 state=directory
+
+- name: install koji config for root to run owner-sync
+  copy: >
+    src=koji-config
+    dest=/root/.koji/config
+    mode=0644
+  tags:
+  - config
+
 #
 # cron job that syncs packages to koji
 #
@@ -179,10 +190,10 @@
   tags:
   - bodhi
   
-- name: sync packages from pkgdb2 to koji (f20)
+- name: sync packages from pkgdb2 to koji (f21)
   cron: name="owner-sync-el5" minute="7,17,27,37,47,57" user="root" 
-        job="/usr/local/bin/owner-sync-pkgdb f20"
-        cron_file=update-koji-owner-f20
+        job="/usr/local/bin/owner-sync-pkgdb f21"
+        cron_file=update-koji-owner-f21
   when: inventory_hostname.startswith('bodhi-backend01')
   tags:
   - bodhi
diff --git a/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts b/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts
index bc1fce0cfb..4ed95ad92d 100644
--- a/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts
+++ b/roles/hosts/files/bodhi-backend01.phx2.fedoraproject.org-hosts
@@ -15,3 +15,4 @@
 10.5.125.44 pkgs.fedoraproject.org
 10.5.124.191 s390.koji.fedoraproject.org
 10.5.124.182 ppc.koji.fedoraproject.org
+10.5.124.138 arm.koji.fedoraproject.org