From b01370a431d8aef443d372fa54784e4a6ca0fed5 Mon Sep 17 00:00:00 2001 From: Valentin Gologuzov Date: Mon, 1 Jun 2015 17:56:42 +0200 Subject: [PATCH] [copr] parametirize frontend for config option `INTRANET_IPS` --- inventory/group_vars/copr | 5 +---- inventory/group_vars/copr-stg | 4 +--- roles/copr/frontend/templates/copr.conf | 2 +- roles/copr/keygen/templates/sign.conf | 2 +- 4 files changed, 4 insertions(+), 9 deletions(-) diff --git a/inventory/group_vars/copr b/inventory/group_vars/copr index ca332e854b..b26eabeb66 100644 --- a/inventory/group_vars/copr +++ b/inventory/group_vars/copr @@ -3,11 +3,8 @@ devel: false _forward_src: "forward" # don't forget to update ip in ./copr-keygen, due to custom firewall rules -# old cloud -##copr_backend_ips: "172.25.80.3 209.132.184.48" -##keygen_host: "172.16.5.25" -copr_backend_ips: "172.25.32.21 209.132.184.48" +copr_backend_ips: ["172.25.32.21", "209.132.184.48"] keygen_host: "172.25.32.20" resolvconf: "resolv.conf/cloud" diff --git a/inventory/group_vars/copr-stg b/inventory/group_vars/copr-stg index 19e684ee33..bd21eedda1 100644 --- a/inventory/group_vars/copr-stg +++ b/inventory/group_vars/copr-stg @@ -4,10 +4,8 @@ devel: true _forward_src: "forward_dev" # don't forget to update ip in ./copr-keygen-stg, due to custom firewall rules -#copr_backend_ips: "172.16.5.24 209.132.184.179" -#keygen_host: "172.16.1.6" -copr_backend_ips: "172.25.32.3 209.132.184.53" +copr_backend_ips: ["172.25.32.3", "209.132.184.53"] keygen_host: "172.25.32.18" resolvconf: "resolv.conf/cloud" diff --git a/roles/copr/frontend/templates/copr.conf b/roles/copr/frontend/templates/copr.conf index 08282547ff..d08da3009e 100644 --- a/roles/copr/frontend/templates/copr.conf +++ b/roles/copr/frontend/templates/copr.conf @@ -38,7 +38,7 @@ PUBLIC_COPR_HOSTNAME = "{{ copr_frontend_public_hostname }}" LOG_FILENAME = "/var/log/copr/frontend.log" # to accept stat events from logstash -INTRANET_IPS = ["127.0.0.1", "172.16.5.0/24"] +INTRANET_IPS = {{ copr_backend_ips }} REPO_GPGCHECK = {% if devel %} 0 {% else %} 1 {% endif %} diff --git a/roles/copr/keygen/templates/sign.conf b/roles/copr/keygen/templates/sign.conf index 785a7339b8..d6dcf34910 100644 --- a/roles/copr/keygen/templates/sign.conf +++ b/roles/copr/keygen/templates/sign.conf @@ -1,4 +1,4 @@ --- -allow: {{ copr_backend_ips }} +allow: "{{ copr_backend_ips|join(' ') }}" phrases: /var/lib/copr-keygen/phrases gpg: /bin/gpg_copr.sh