Infrastructure/ansible
1
0
Fork 0
Code Issues Pull requests 6 Projects Releases Packages Wiki Activity Actions

[copr] parametirize frontend for config option INTRANET_IPS

Browse source
This commit is contained in:
Valentin Gologuzov 2015-06-01 17:56:42 +02:00
parent 74069292e5
commit b01370a431
4 changed files with 4 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

5
inventory/group_vars/copr
View file

@ -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"

4
inventory/group_vars/copr-stg
View file

@ -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"

2
roles/copr/frontend/templates/copr.conf
View file

@ -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 %}

2
roles/copr/keygen/templates/sign.conf
View file

@ -1,4 +1,4 @@
---
allow: {{ copr_backend_ips }}
allow: "{{ copr_backend_ips|join(' ') }}"
phrases: /var/lib/copr-keygen/phrases
gpg: /bin/gpg_copr.sh