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

ok maybe this will work..maybe this will die in a fire

Browse source
This commit is contained in:
Stephen Smoogen 2017-01-08 23:07:48 +00:00
parent 9e04e140a3
commit 4ebf84db0b
42 changed files with 42 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
inventory/group_vars/anitya-frontend
View file

@ -21,7 +21,7 @@ custom_rules: [
fas_client_groups: sysadmin-noc,sysadmin-web fas_client_groups: sysadmin-noc,sysadmin-web
freezes: false freezes: false
vpn: true
# These are consumed by a task in roles/fedmsg/base/main.yml # These are consumed by a task in roles/fedmsg/base/main.yml
fedmsg_certs: fedmsg_certs:
- service: shell - service: shell

1
inventory/group_vars/smtp-mm
View file

@ -13,3 +13,4 @@ fas_client_groups: sysadmin-noc,sysadmin-tools,fi-apprentice,sysadmin-veteran
postfix_transport_filename: transports.mm-smtp postfix_transport_filename: transports.mm-smtp
postfix_group: smtp-mm postfix_group: smtp-mm
vpn: true

1
inventory/host_vars/bastion01.phx2.fedoraproject.org
View file

@ -9,3 +9,4 @@ eth0_ip: 10.5.126.12
vmhost: virthost02.phx2.fedoraproject.org vmhost: virthost02.phx2.fedoraproject.org
datacenter: phx2 datacenter: phx2
vpn: true

1
inventory/host_vars/bastion02.phx2.fedoraproject.org
View file

@ -9,3 +9,4 @@ eth0_ip: 10.5.126.11
vmhost: virthost21.phx2.fedoraproject.org vmhost: virthost21.phx2.fedoraproject.org
datacenter: phx2 datacenter: phx2
vpn: true

1
inventory/host_vars/coloamer01.fedoraproject.org
View file

@ -2,6 +2,7 @@
datacenter: coloamer datacenter: coloamer
virthost: true virthost: true
postfix_group: vpn postfix_group: vpn
vpn: true
br0_ip: 67.203.2.66 br0_ip: 67.203.2.66
br0_nm: 255.255.255.248 br0_nm: 255.255.255.248
has_ipv6: yes has_ipv6: yes

1
inventory/host_vars/dedicatedsolutions01.fedoraproject.org
View file

@ -5,6 +5,7 @@ nrpe_procs_warn: 900
nrpe_procs_crit: 1000 nrpe_procs_crit: 1000
postfix_group: vpn postfix_group: vpn
vpn: true
br0_ip: 67.219.144.66 br0_ip: 67.219.144.66
br0_nm: 255.255.255.248 br0_nm: 255.255.255.248
has_ipv6: yes has_ipv6: yes

1
inventory/host_vars/download-ib01.fedoraproject.org
View file

@ -17,6 +17,7 @@ eth0_ipv6_gw: "2610:28:3090:3001::1"
datacenter: ibiblio datacenter: ibiblio
postfix_group: vpn postfix_group: vpn
vpn: true
tcp_ports: [80, 443, 873] tcp_ports: [80, 443, 873]
rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}"

1
inventory/host_vars/download-ib02.fedoraproject.org
View file

@ -14,6 +14,7 @@ eth0_ipv6_gw: "2610:28:3090:3001::1"
vmhost: ibiblio04.fedoraproject.org vmhost: ibiblio04.fedoraproject.org
datacenter: ibiblio datacenter: ibiblio
postfix_group: vpn postfix_group: vpn
vpn: true
tcp_ports: [80, 443, 873] tcp_ports: [80, 443, 873]
rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}"

1
inventory/host_vars/download-rdu01.fedoraproject.org
View file

@ -6,6 +6,7 @@ nm: 255.255.255.192
gw: 204.85.14.62 gw: 204.85.14.62
dns: 8.8.8.8 dns: 8.8.8.8
postfix_group: vpn postfix_group: vpn
vpn: true
eth0_ip: 204.85.14.1 eth0_ip: 204.85.14.1
eth0_nm: 255.255.255.192 eth0_nm: 255.255.255.192
eth1_ip: 172.31.1.1 eth1_ip: 172.31.1.1

1
inventory/host_vars/ibiblio02.fedoraproject.org
View file

@ -13,5 +13,6 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe02"
br0_ipv6_gw: "2610:28:3090:3001::1" br0_ipv6_gw: "2610:28:3090:3001::1"
postfix_group: vpn postfix_group: vpn
vpn: true
freezes: true freezes: true

1
inventory/host_vars/ibiblio03.fedoraproject.org
View file

@ -12,3 +12,4 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe03"
br0_ipv6_gw: "2610:28:3090:3001::1" br0_ipv6_gw: "2610:28:3090:3001::1"
postfix_group: vpn postfix_group: vpn
vpn: true

1
inventory/host_vars/ibiblio04.fedoraproject.org
View file

@ -12,3 +12,4 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe04"
br0_ipv6_gw: "2610:28:3090:3001::1" br0_ipv6_gw: "2610:28:3090:3001::1"
postfix_group: vpn postfix_group: vpn
vpn: true

1
inventory/host_vars/ibiblio05.fedoraproject.org
View file

@ -12,3 +12,4 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe05"
br0_ipv6_gw: "2610:28:3090:3001::1" br0_ipv6_gw: "2610:28:3090:3001::1"
postfix_group: vpn postfix_group: vpn
vpn: true

1
inventory/host_vars/infinote.fedoraproject.org
View file

@ -12,6 +12,7 @@ eth0_ipv6: "2605:bc80:3010:600:dead:beef:cafe:fed4"
eth0_ipv6_gw: "2605:bc80:3010:600::1" eth0_ipv6_gw: "2605:bc80:3010:600::1"
postfix_group: vpn postfix_group: vpn
vpn: true
vmhost: osuosl03.fedoraproject.org vmhost: osuosl03.fedoraproject.org
datacenter: osuosl datacenter: osuosl

1
inventory/host_vars/noc02.fedoraproject.org
View file

@ -18,6 +18,7 @@ postfix_transport_filename: transports.noc02.fedoraproject.org
vmhost: ibiblio04.fedoraproject.org vmhost: ibiblio04.fedoraproject.org
datacenter: ibiblio datacenter: ibiblio
postfix_group: vpn postfix_group: vpn
vpn: true
csi_relationship: | csi_relationship: |
noc02 is the external monitoring nagios instance. noc02 is the external monitoring nagios instance.

1
inventory/host_vars/ns02.fedoraproject.org
View file

@ -12,6 +12,7 @@ eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed5"
eth0_ipv6_gw: "2610:28:3090:3001::1" eth0_ipv6_gw: "2610:28:3090:3001::1"
postfix_group: vpn postfix_group: vpn
vpn: true
vmhost: ibiblio05.fedoraproject.org vmhost: ibiblio05.fedoraproject.org
datacenter: ibiblio datacenter: ibiblio

1
inventory/host_vars/ns05.fedoraproject.org
View file

@ -12,6 +12,7 @@ eth0_ipv6: "2001:4178:2:1269:dead:beef:cafe:fed5"
eth0_ipv6_gw: "2001:4178:2:1269::1" eth0_ipv6_gw: "2001:4178:2:1269::1"
postfix_group: vpn postfix_group: vpn
vpn: true
vmhost: internetx01.fedoraproject.org vmhost: internetx01.fedoraproject.org
datacenter: internetx datacenter: internetx

1
inventory/host_vars/people02.fedoraproject.org
View file

@ -15,6 +15,7 @@ eth0_nm: 255.255.255.128
ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-people ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-people
ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
postfix_group: vpn postfix_group: vpn
vpn: true
vmhost: ibiblio05.fedoraproject.org vmhost: ibiblio05.fedoraproject.org
datacenter: ibiblio datacenter: ibiblio

1
inventory/host_vars/proxy01.phx2.fedoraproject.org
View file

@ -18,3 +18,4 @@ nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400
collectd_graphite: True collectd_graphite: True
vpn: true

1
inventory/host_vars/proxy02.fedoraproject.org
View file

@ -20,6 +20,7 @@ eth0_ipv6_gw: "2001:4178:2:1269::1"
sponsor: internetx sponsor: internetx
datacenter: internetx datacenter: internetx
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400

1
inventory/host_vars/proxy03.fedoraproject.org
View file

@ -16,6 +16,7 @@ eth0_nm: 255.255.255.240
sponsor: tummy sponsor: tummy
datacenter: tummy datacenter: tummy
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 900 nrpe_procs_warn: 900
nrpe_procs_crit: 1000 nrpe_procs_crit: 1000

1
inventory/host_vars/proxy04.fedoraproject.org
View file

@ -26,3 +26,4 @@ nrpe_procs_crit: 1400
mem_size: 16384 mem_size: 16384
max_mem_size: 20000 max_mem_size: 20000
num_cpus: 8 num_cpus: 8
vpn: true

1
inventory/host_vars/proxy05.fedoraproject.org
View file

@ -15,3 +15,4 @@ nrpe_procs_crit: 1400
#dns: 8.8.8.8 #dns: 8.8.8.8
#eth0_ip: 185.141.165.254 #eth0_ip: 185.141.165.254
#eth0_nm: 255.255.254.0 #eth0_nm: 255.255.254.0
vpn: true

1
inventory/host_vars/proxy06.fedoraproject.org
View file

@ -22,3 +22,4 @@ postfix_group: vpn
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400
vpn: true

1
inventory/host_vars/proxy07.fedoraproject.org
View file

@ -13,3 +13,4 @@ postfix_group: vpn
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400
vpn: true

1
inventory/host_vars/proxy08.fedoraproject.org
View file

@ -12,6 +12,7 @@ eth0_ipv6: "2607:f188::dead:beef:cafe:fed1"
eth0_ipv6_gw: "2607:f188::1" eth0_ipv6_gw: "2607:f188::1"
vmhost: coloamer01.fedoraproject.org vmhost: coloamer01.fedoraproject.org
datacenter: coloamer datacenter: coloamer
vpn: true
# This is consumed by the roles/fedora-web/main role # This is consumed by the roles/fedora-web/main role
sponsor: colamer sponsor: colamer

1
inventory/host_vars/proxy09.fedoraproject.org
View file

@ -19,6 +19,7 @@ eth0_ipv6_gw: "2605:bc80:3010:600::1"
sponsor: osuosl sponsor: osuosl
datacenter: osuosl datacenter: osuosl
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400

1
inventory/host_vars/proxy10.phx2.fedoraproject.org
View file

@ -18,3 +18,4 @@ nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400
collectd_graphite: True collectd_graphite: True
vpn: true

1
inventory/host_vars/proxy11.fedoraproject.org
View file

@ -20,6 +20,7 @@ eth0_ipv6_gw: "2604:1580:fe00::1"
sponsor: dedicatedsolutions sponsor: dedicatedsolutions
datacenter: dedicatedsolutions datacenter: dedicatedsolutions
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400

1
inventory/host_vars/proxy12.fedoraproject.org
View file

@ -19,6 +19,7 @@ eth0_ipv6_gw: "2610:28:3090:3001::1"
sponsor: ibiblio sponsor: ibiblio
datacenter: ibiblio datacenter: ibiblio
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400

1
inventory/host_vars/proxy13.fedoraproject.org
View file

@ -16,6 +16,7 @@ eth0_nm: 255.255.255.192
sponsor: redhat sponsor: redhat
datacenter: rdu datacenter: rdu
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400

1
inventory/host_vars/proxy14.fedoraproject.org
View file

@ -16,6 +16,7 @@ eth0_nm: 255.255.255.0
sponsor: redhat sponsor: redhat
datacenter: rdu-cc datacenter: rdu-cc
postfix_group: vpn postfix_group: vpn
vpn: true
nrpe_procs_warn: 1200 nrpe_procs_warn: 1200
nrpe_procs_crit: 1400 nrpe_procs_crit: 1400

1
inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org
View file

@ -13,3 +13,4 @@ eth0_ipv6_gw: "2605:bc80:3010:600::1"
vmhost: osuosl02.fedoraproject.org vmhost: osuosl02.fedoraproject.org
datacenter: osuosl datacenter: osuosl
vpn: true

1
inventory/host_vars/smtp-mm-tummy01.fedoraproject.org
View file

@ -9,3 +9,4 @@ eth0_ip: 66.35.62.164
eth0_nm: 255.255.255.248 eth0_nm: 255.255.255.248
vmhost: tummy01.fedoraproject.org vmhost: tummy01.fedoraproject.org
datacenter: tummy datacenter: tummy
vpn: true

1
inventory/host_vars/torrent02.fedoraproject.org
View file

@ -15,6 +15,7 @@ ks_url: http://209.132.181.6/repo/rhel/ks/kvm-rhel-7-ext
ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ ks_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/
postfix_group: vpn postfix_group: vpn
vpn: true
vmhost: ibiblio05.fedoraproject.org vmhost: ibiblio05.fedoraproject.org
datacenter: ibiblio datacenter: ibiblio

1
inventory/host_vars/tummy01.fedoraproject.org
View file

@ -8,3 +8,4 @@ dns: 198.49.126.1
postfix_group: vpn postfix_group: vpn
br0_ip: 66.35.62.161 br0_ip: 66.35.62.161
br0_nm: 255.255.255.248 br0_nm: 255.255.255.248
vpn: true

1
inventory/host_vars/unbound-ib01.fedoraproject.org
View file

@ -10,3 +10,4 @@ eth0_nm: 255.255.255.128
vmhost: ibiblio04.fedoraproject.org vmhost: ibiblio04.fedoraproject.org
datacenter: ibiblio datacenter: ibiblio
postfix_group: vpn postfix_group: vpn
vpn: true

1
inventory/host_vars/unbound-osuosl01.fedoraproject.org
View file

@ -10,3 +10,4 @@ eth0_nm: 255.255.255.128
vmhost: osuosl03.fedoraproject.org vmhost: osuosl03.fedoraproject.org
datacenter: osuosl datacenter: osuosl
postfix_group: vpn postfix_group: vpn
vpn: true

1
inventory/host_vars/unbound-tummy01.fedoraproject.org
View file

@ -9,3 +9,4 @@ eth0_ip: 66.35.62.163
eth0_nm: 255.255.255.248 eth0_nm: 255.255.255.248
vmhost: tummy01.fedoraproject.org vmhost: tummy01.fedoraproject.org
datacenter: tummy datacenter: tummy
vpn: true

1
inventory/host_vars/virthost-cc-rdu01.fedoraproject.org
View file

@ -7,3 +7,4 @@ br0_nm: 255.255.255.0
gw: 8.43.85.254 gw: 8.43.85.254
dns: 8.8.8.8 dns: 8.8.8.8
postfix_group: vpn postfix_group: vpn
vpn: true

1
inventory/host_vars/virthost-rdu01.fedoraproject.org
View file

@ -8,3 +8,4 @@ dns: 8.8.8.8
postfix_group: vpn postfix_group: vpn
br0_ip: 204.85.14.4 br0_ip: 204.85.14.4
br0_nm: 255.255.255.192 br0_nm: 255.255.255.192
vpn: true

2
roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2
View file

@ -5,6 +5,6 @@
define hostgroup { define hostgroup {
hostgroup_name vpnclients hostgroup_name vpnclients
alias vpnclients alias vpnclients
members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,unbound-osuosl01,coloamer01,proxy08,osuosl02,proxy09,download-ib01,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,people02,internetx01,ns05,proxy02,osuosl01,proxy06,osuosl02,osuosl03,hosted03,smtp-mm-osuosl01,dedicatedsolutions01,proxy05,dedicatedsolutions01,proxy11,ibiblio05,proxy12 members {% for host in groups['all'] %}{% if hostvars[host].vpn == 'true' %}{{host}},{% endif %} {% endfor %}
} }