From ee31d7b4d41fe227341038c78fb8302092401fbb Mon Sep 17 00:00:00 2001
From: Valentin Gologuzov <vgologuz@redhat.com>
Date: Fri, 12 Dec 2014 17:13:20 +0100
Subject: [PATCH] [copr] backend/keygen updated ip configuration; fixed
 `gpg_binary` option for keygen

---
 inventory/group_vars/copr             | 3 ++-
 inventory/group_vars/copr-back        | 1 -
 inventory/group_vars/copr-back-stg    | 1 -
 inventory/group_vars/copr-stg         | 3 ++-
 roles/copr/keygen/templates/sign.conf | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr
index f3ae31badf..3918b28164 100644
--- a/inventory/group_vars/copr
+++ b/inventory/group_vars/copr
@@ -1,6 +1,7 @@
 ---
 devel: false
 _forward_src: "forward"
-copr_backend_ips: "172.16.5.4"
+copr_backend_ips: "172.16.5.4 209.132.184.142"
+copr_keygen_ip: "172.16.5.25"
 resolvconf: "resolv.conf/cloud"
 
diff --git a/inventory/group_vars/copr-back b/inventory/group_vars/copr-back
index 209c0a40c7..7f13a5e132 100644
--- a/inventory/group_vars/copr-back
+++ b/inventory/group_vars/copr-back
@@ -3,6 +3,5 @@ _lighttpd_conf_src: "lighttpd/lighttpd.conf"
 _copr_be_conf: "copr-be.conf"
 
 do_sign: "false"
-keygen_host: "copr-keygen.cloud.fedoraproject.org"
 
 spawn_in_advance: "true"
diff --git a/inventory/group_vars/copr-back-stg b/inventory/group_vars/copr-back-stg
index 12bb42116a..a2274dff2b 100644
--- a/inventory/group_vars/copr-back-stg
+++ b/inventory/group_vars/copr-back-stg
@@ -3,6 +3,5 @@ _lighttpd_conf_src: "lighttpd/lighttpd_dev.conf"
 _copr_be_conf: "copr-be.conf-dev"
 
 do_sign: "true"
-keygen_host: "209.132.184.124"
 
 spawn_in_advance: "true"
diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr-stg
index fe359577bc..6e7132ec38 100644
--- a/inventory/group_vars/copr-stg
+++ b/inventory/group_vars/copr-stg
@@ -3,5 +3,6 @@ devel: true
 #_forward-src: "{{ files }}/copr/forward-dev"
 _forward_src: "forward_dev"
 
-copr_backend_ips: "172.16.5.5 172.16.5.4 172.16.5.24"
+copr_backend_ips: "172.16.5.24 209.132.184.179"
+keygen_host: "172.16.1.6"
 resolvconf: "resolv.conf/cloud"
diff --git a/roles/copr/keygen/templates/sign.conf b/roles/copr/keygen/templates/sign.conf
index eed3e25b11..785a7339b8 100644
--- a/roles/copr/keygen/templates/sign.conf
+++ b/roles/copr/keygen/templates/sign.conf
@@ -1,4 +1,4 @@
 ---
 allow: {{ copr_backend_ips }}
 phrases: /var/lib/copr-keygen/phrases
-gpg: /bin/gpg_copr
+gpg: /bin/gpg_copr.sh