From 4ebf84db0be8a8c97072b17401e633e907b6e9ec Mon Sep 17 00:00:00 2001 From: Stephen Smoogen Date: Sun, 8 Jan 2017 23:07:48 +0000 Subject: [PATCH] ok maybe this will work..maybe this will die in a fire --- inventory/group_vars/anitya-frontend | 2 +- inventory/group_vars/smtp-mm | 1 + inventory/host_vars/bastion01.phx2.fedoraproject.org | 1 + inventory/host_vars/bastion02.phx2.fedoraproject.org | 1 + inventory/host_vars/coloamer01.fedoraproject.org | 1 + inventory/host_vars/dedicatedsolutions01.fedoraproject.org | 1 + inventory/host_vars/download-ib01.fedoraproject.org | 1 + inventory/host_vars/download-ib02.fedoraproject.org | 1 + inventory/host_vars/download-rdu01.fedoraproject.org | 1 + inventory/host_vars/ibiblio02.fedoraproject.org | 1 + inventory/host_vars/ibiblio03.fedoraproject.org | 1 + inventory/host_vars/ibiblio04.fedoraproject.org | 1 + inventory/host_vars/ibiblio05.fedoraproject.org | 1 + inventory/host_vars/infinote.fedoraproject.org | 1 + inventory/host_vars/noc02.fedoraproject.org | 1 + inventory/host_vars/ns02.fedoraproject.org | 1 + inventory/host_vars/ns05.fedoraproject.org | 1 + inventory/host_vars/people02.fedoraproject.org | 1 + inventory/host_vars/proxy01.phx2.fedoraproject.org | 1 + inventory/host_vars/proxy02.fedoraproject.org | 1 + inventory/host_vars/proxy03.fedoraproject.org | 1 + inventory/host_vars/proxy04.fedoraproject.org | 1 + inventory/host_vars/proxy05.fedoraproject.org | 1 + inventory/host_vars/proxy06.fedoraproject.org | 1 + inventory/host_vars/proxy07.fedoraproject.org | 1 + inventory/host_vars/proxy08.fedoraproject.org | 1 + inventory/host_vars/proxy09.fedoraproject.org | 1 + inventory/host_vars/proxy10.phx2.fedoraproject.org | 1 + inventory/host_vars/proxy11.fedoraproject.org | 1 + inventory/host_vars/proxy12.fedoraproject.org | 1 + inventory/host_vars/proxy13.fedoraproject.org | 1 + inventory/host_vars/proxy14.fedoraproject.org | 1 + inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org | 1 + inventory/host_vars/smtp-mm-tummy01.fedoraproject.org | 1 + inventory/host_vars/torrent02.fedoraproject.org | 1 + inventory/host_vars/tummy01.fedoraproject.org | 1 + inventory/host_vars/unbound-ib01.fedoraproject.org | 1 + inventory/host_vars/unbound-osuosl01.fedoraproject.org | 1 + inventory/host_vars/unbound-tummy01.fedoraproject.org | 1 + inventory/host_vars/virthost-cc-rdu01.fedoraproject.org | 1 + inventory/host_vars/virthost-rdu01.fedoraproject.org | 1 + .../nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 | 2 +- 42 files changed, 42 insertions(+), 2 deletions(-) diff --git a/inventory/group_vars/anitya-frontend b/inventory/group_vars/anitya-frontend index 02c73bec71..138ae73fc5 100644 --- a/inventory/group_vars/anitya-frontend +++ b/inventory/group_vars/anitya-frontend @@ -21,7 +21,7 @@ custom_rules: [ fas_client_groups: sysadmin-noc,sysadmin-web freezes: false - +vpn: true # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: - service: shell diff --git a/inventory/group_vars/smtp-mm b/inventory/group_vars/smtp-mm index 787cb121cf..5026f332f7 100644 --- a/inventory/group_vars/smtp-mm +++ b/inventory/group_vars/smtp-mm @@ -13,3 +13,4 @@ fas_client_groups: sysadmin-noc,sysadmin-tools,fi-apprentice,sysadmin-veteran postfix_transport_filename: transports.mm-smtp postfix_group: smtp-mm +vpn: true diff --git a/inventory/host_vars/bastion01.phx2.fedoraproject.org b/inventory/host_vars/bastion01.phx2.fedoraproject.org index e6d08801c3..ec6eaff1ed 100644 --- a/inventory/host_vars/bastion01.phx2.fedoraproject.org +++ b/inventory/host_vars/bastion01.phx2.fedoraproject.org @@ -9,3 +9,4 @@ eth0_ip: 10.5.126.12 vmhost: virthost02.phx2.fedoraproject.org datacenter: phx2 +vpn: true diff --git a/inventory/host_vars/bastion02.phx2.fedoraproject.org b/inventory/host_vars/bastion02.phx2.fedoraproject.org index 6feaa6db00..a7a92b01ee 100644 --- a/inventory/host_vars/bastion02.phx2.fedoraproject.org +++ b/inventory/host_vars/bastion02.phx2.fedoraproject.org @@ -9,3 +9,4 @@ eth0_ip: 10.5.126.11 vmhost: virthost21.phx2.fedoraproject.org datacenter: phx2 +vpn: true diff --git a/inventory/host_vars/coloamer01.fedoraproject.org b/inventory/host_vars/coloamer01.fedoraproject.org index 3a9c8c3fb9..598eda966d 100644 --- a/inventory/host_vars/coloamer01.fedoraproject.org +++ b/inventory/host_vars/coloamer01.fedoraproject.org @@ -2,6 +2,7 @@ datacenter: coloamer virthost: true postfix_group: vpn +vpn: true br0_ip: 67.203.2.66 br0_nm: 255.255.255.248 has_ipv6: yes diff --git a/inventory/host_vars/dedicatedsolutions01.fedoraproject.org b/inventory/host_vars/dedicatedsolutions01.fedoraproject.org index 8cc297abfb..191e9929ed 100644 --- a/inventory/host_vars/dedicatedsolutions01.fedoraproject.org +++ b/inventory/host_vars/dedicatedsolutions01.fedoraproject.org @@ -5,6 +5,7 @@ nrpe_procs_warn: 900 nrpe_procs_crit: 1000 postfix_group: vpn +vpn: true br0_ip: 67.219.144.66 br0_nm: 255.255.255.248 has_ipv6: yes diff --git a/inventory/host_vars/download-ib01.fedoraproject.org b/inventory/host_vars/download-ib01.fedoraproject.org index 3884b1029f..ed0559d6a6 100644 --- a/inventory/host_vars/download-ib01.fedoraproject.org +++ b/inventory/host_vars/download-ib01.fedoraproject.org @@ -17,6 +17,7 @@ eth0_ipv6_gw: "2610:28:3090:3001::1" datacenter: ibiblio postfix_group: vpn +vpn: true tcp_ports: [80, 443, 873] rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" diff --git a/inventory/host_vars/download-ib02.fedoraproject.org b/inventory/host_vars/download-ib02.fedoraproject.org index 63bf71951f..069d24eefd 100644 --- a/inventory/host_vars/download-ib02.fedoraproject.org +++ b/inventory/host_vars/download-ib02.fedoraproject.org @@ -14,6 +14,7 @@ eth0_ipv6_gw: "2610:28:3090:3001::1" vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio postfix_group: vpn +vpn: true tcp_ports: [80, 443, 873] rsyncd_conf: "rsyncd.conf.download-{{ datacenter }}" diff --git a/inventory/host_vars/download-rdu01.fedoraproject.org b/inventory/host_vars/download-rdu01.fedoraproject.org index 9b031d9a0b..792376b30a 100644 --- a/inventory/host_vars/download-rdu01.fedoraproject.org +++ b/inventory/host_vars/download-rdu01.fedoraproject.org @@ -6,6 +6,7 @@ nm: 255.255.255.192 gw: 204.85.14.62 dns: 8.8.8.8 postfix_group: vpn +vpn: true eth0_ip: 204.85.14.1 eth0_nm: 255.255.255.192 eth1_ip: 172.31.1.1 diff --git a/inventory/host_vars/ibiblio02.fedoraproject.org b/inventory/host_vars/ibiblio02.fedoraproject.org index ef5f508c4c..81490b0194 100644 --- a/inventory/host_vars/ibiblio02.fedoraproject.org +++ b/inventory/host_vars/ibiblio02.fedoraproject.org @@ -13,5 +13,6 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe02" br0_ipv6_gw: "2610:28:3090:3001::1" postfix_group: vpn +vpn: true freezes: true diff --git a/inventory/host_vars/ibiblio03.fedoraproject.org b/inventory/host_vars/ibiblio03.fedoraproject.org index 29b4dc0bbe..bd1dbd93fe 100644 --- a/inventory/host_vars/ibiblio03.fedoraproject.org +++ b/inventory/host_vars/ibiblio03.fedoraproject.org @@ -12,3 +12,4 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe03" br0_ipv6_gw: "2610:28:3090:3001::1" postfix_group: vpn +vpn: true diff --git a/inventory/host_vars/ibiblio04.fedoraproject.org b/inventory/host_vars/ibiblio04.fedoraproject.org index 4fab950425..55ba9fb3b2 100644 --- a/inventory/host_vars/ibiblio04.fedoraproject.org +++ b/inventory/host_vars/ibiblio04.fedoraproject.org @@ -12,3 +12,4 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe04" br0_ipv6_gw: "2610:28:3090:3001::1" postfix_group: vpn +vpn: true diff --git a/inventory/host_vars/ibiblio05.fedoraproject.org b/inventory/host_vars/ibiblio05.fedoraproject.org index f8b2afc439..5c3fba9a5b 100644 --- a/inventory/host_vars/ibiblio05.fedoraproject.org +++ b/inventory/host_vars/ibiblio05.fedoraproject.org @@ -12,3 +12,4 @@ br0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fe05" br0_ipv6_gw: "2610:28:3090:3001::1" postfix_group: vpn +vpn: true diff --git a/inventory/host_vars/infinote.fedoraproject.org b/inventory/host_vars/infinote.fedoraproject.org index 55a729801a..38bd1dab18 100644 --- a/inventory/host_vars/infinote.fedoraproject.org +++ b/inventory/host_vars/infinote.fedoraproject.org @@ -12,6 +12,7 @@ eth0_ipv6: "2605:bc80:3010:600:dead:beef:cafe:fed4" eth0_ipv6_gw: "2605:bc80:3010:600::1" postfix_group: vpn +vpn: true vmhost: osuosl03.fedoraproject.org datacenter: osuosl diff --git a/inventory/host_vars/noc02.fedoraproject.org b/inventory/host_vars/noc02.fedoraproject.org index 5410afb858..845c9c901d 100644 --- a/inventory/host_vars/noc02.fedoraproject.org +++ b/inventory/host_vars/noc02.fedoraproject.org @@ -18,6 +18,7 @@ postfix_transport_filename: transports.noc02.fedoraproject.org vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio postfix_group: vpn +vpn: true csi_relationship: | noc02 is the external monitoring nagios instance. diff --git a/inventory/host_vars/ns02.fedoraproject.org b/inventory/host_vars/ns02.fedoraproject.org index 43a32ceb06..38d47290dc 100644 --- a/inventory/host_vars/ns02.fedoraproject.org +++ b/inventory/host_vars/ns02.fedoraproject.org @@ -12,6 +12,7 @@ eth0_ipv6: "2610:28:3090:3001:dead:beef:cafe:fed5" eth0_ipv6_gw: "2610:28:3090:3001::1" postfix_group: vpn +vpn: true vmhost: ibiblio05.fedoraproject.org datacenter: ibiblio diff --git a/inventory/host_vars/ns05.fedoraproject.org b/inventory/host_vars/ns05.fedoraproject.org index 11fe60bfd2..44df3c945f 100644 --- a/inventory/host_vars/ns05.fedoraproject.org +++ b/inventory/host_vars/ns05.fedoraproject.org @@ -12,6 +12,7 @@ eth0_ipv6: "2001:4178:2:1269:dead:beef:cafe:fed5" eth0_ipv6_gw: "2001:4178:2:1269::1" postfix_group: vpn +vpn: true vmhost: internetx01.fedoraproject.org datacenter: internetx diff --git a/inventory/host_vars/people02.fedoraproject.org b/inventory/host_vars/people02.fedoraproject.org index cb2a3b03f1..b6dc076761 100644 --- a/inventory/host_vars/people02.fedoraproject.org +++ b/inventory/host_vars/people02.fedoraproject.org @@ -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_repo: http://209.132.181.6/repo/rhel/RHEL7-x86_64/ postfix_group: vpn +vpn: true vmhost: ibiblio05.fedoraproject.org datacenter: ibiblio diff --git a/inventory/host_vars/proxy01.phx2.fedoraproject.org b/inventory/host_vars/proxy01.phx2.fedoraproject.org index 60fc56b0e4..2871bedb0c 100644 --- a/inventory/host_vars/proxy01.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy01.phx2.fedoraproject.org @@ -18,3 +18,4 @@ nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 collectd_graphite: True +vpn: true diff --git a/inventory/host_vars/proxy02.fedoraproject.org b/inventory/host_vars/proxy02.fedoraproject.org index 9d90c2fdc1..adb2ace762 100644 --- a/inventory/host_vars/proxy02.fedoraproject.org +++ b/inventory/host_vars/proxy02.fedoraproject.org @@ -20,6 +20,7 @@ eth0_ipv6_gw: "2001:4178:2:1269::1" sponsor: internetx datacenter: internetx postfix_group: vpn +vpn: true nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 diff --git a/inventory/host_vars/proxy03.fedoraproject.org b/inventory/host_vars/proxy03.fedoraproject.org index 68d2f7b9f9..fed0dc1569 100644 --- a/inventory/host_vars/proxy03.fedoraproject.org +++ b/inventory/host_vars/proxy03.fedoraproject.org @@ -16,6 +16,7 @@ eth0_nm: 255.255.255.240 sponsor: tummy datacenter: tummy postfix_group: vpn +vpn: true nrpe_procs_warn: 900 nrpe_procs_crit: 1000 diff --git a/inventory/host_vars/proxy04.fedoraproject.org b/inventory/host_vars/proxy04.fedoraproject.org index 7e614c78ea..8ce559fb7b 100644 --- a/inventory/host_vars/proxy04.fedoraproject.org +++ b/inventory/host_vars/proxy04.fedoraproject.org @@ -26,3 +26,4 @@ nrpe_procs_crit: 1400 mem_size: 16384 max_mem_size: 20000 num_cpus: 8 +vpn: true diff --git a/inventory/host_vars/proxy05.fedoraproject.org b/inventory/host_vars/proxy05.fedoraproject.org index 304c385bb7..8f50c3e09a 100644 --- a/inventory/host_vars/proxy05.fedoraproject.org +++ b/inventory/host_vars/proxy05.fedoraproject.org @@ -15,3 +15,4 @@ nrpe_procs_crit: 1400 #dns: 8.8.8.8 #eth0_ip: 185.141.165.254 #eth0_nm: 255.255.254.0 +vpn: true diff --git a/inventory/host_vars/proxy06.fedoraproject.org b/inventory/host_vars/proxy06.fedoraproject.org index 81d2e71e1f..834b402b07 100644 --- a/inventory/host_vars/proxy06.fedoraproject.org +++ b/inventory/host_vars/proxy06.fedoraproject.org @@ -22,3 +22,4 @@ postfix_group: vpn nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 +vpn: true diff --git a/inventory/host_vars/proxy07.fedoraproject.org b/inventory/host_vars/proxy07.fedoraproject.org index 2787f1ca77..04db993832 100644 --- a/inventory/host_vars/proxy07.fedoraproject.org +++ b/inventory/host_vars/proxy07.fedoraproject.org @@ -13,3 +13,4 @@ postfix_group: vpn nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 +vpn: true diff --git a/inventory/host_vars/proxy08.fedoraproject.org b/inventory/host_vars/proxy08.fedoraproject.org index b8e8361e1d..f97df0ed29 100644 --- a/inventory/host_vars/proxy08.fedoraproject.org +++ b/inventory/host_vars/proxy08.fedoraproject.org @@ -12,6 +12,7 @@ eth0_ipv6: "2607:f188::dead:beef:cafe:fed1" eth0_ipv6_gw: "2607:f188::1" vmhost: coloamer01.fedoraproject.org datacenter: coloamer +vpn: true # This is consumed by the roles/fedora-web/main role sponsor: colamer diff --git a/inventory/host_vars/proxy09.fedoraproject.org b/inventory/host_vars/proxy09.fedoraproject.org index c44148b96f..0612e3742e 100644 --- a/inventory/host_vars/proxy09.fedoraproject.org +++ b/inventory/host_vars/proxy09.fedoraproject.org @@ -19,6 +19,7 @@ eth0_ipv6_gw: "2605:bc80:3010:600::1" sponsor: osuosl datacenter: osuosl postfix_group: vpn +vpn: true nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 diff --git a/inventory/host_vars/proxy10.phx2.fedoraproject.org b/inventory/host_vars/proxy10.phx2.fedoraproject.org index e351b80d04..90ae5d6f7a 100644 --- a/inventory/host_vars/proxy10.phx2.fedoraproject.org +++ b/inventory/host_vars/proxy10.phx2.fedoraproject.org @@ -18,3 +18,4 @@ nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 collectd_graphite: True +vpn: true diff --git a/inventory/host_vars/proxy11.fedoraproject.org b/inventory/host_vars/proxy11.fedoraproject.org index 66f0514ff9..4fafbed6d8 100644 --- a/inventory/host_vars/proxy11.fedoraproject.org +++ b/inventory/host_vars/proxy11.fedoraproject.org @@ -20,6 +20,7 @@ eth0_ipv6_gw: "2604:1580:fe00::1" sponsor: dedicatedsolutions datacenter: dedicatedsolutions postfix_group: vpn +vpn: true nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 diff --git a/inventory/host_vars/proxy12.fedoraproject.org b/inventory/host_vars/proxy12.fedoraproject.org index 8296767ebc..b6fcb608bb 100644 --- a/inventory/host_vars/proxy12.fedoraproject.org +++ b/inventory/host_vars/proxy12.fedoraproject.org @@ -19,6 +19,7 @@ eth0_ipv6_gw: "2610:28:3090:3001::1" sponsor: ibiblio datacenter: ibiblio postfix_group: vpn +vpn: true nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 diff --git a/inventory/host_vars/proxy13.fedoraproject.org b/inventory/host_vars/proxy13.fedoraproject.org index 5735d980ae..1506c1308b 100644 --- a/inventory/host_vars/proxy13.fedoraproject.org +++ b/inventory/host_vars/proxy13.fedoraproject.org @@ -16,6 +16,7 @@ eth0_nm: 255.255.255.192 sponsor: redhat datacenter: rdu postfix_group: vpn +vpn: true nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 diff --git a/inventory/host_vars/proxy14.fedoraproject.org b/inventory/host_vars/proxy14.fedoraproject.org index f9b38273b0..35aa2bdd89 100644 --- a/inventory/host_vars/proxy14.fedoraproject.org +++ b/inventory/host_vars/proxy14.fedoraproject.org @@ -16,6 +16,7 @@ eth0_nm: 255.255.255.0 sponsor: redhat datacenter: rdu-cc postfix_group: vpn +vpn: true nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 diff --git a/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org b/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org index 0a6e7a212d..67067e4d3b 100644 --- a/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-osuosl01.fedoraproject.org @@ -13,3 +13,4 @@ eth0_ipv6_gw: "2605:bc80:3010:600::1" vmhost: osuosl02.fedoraproject.org datacenter: osuosl +vpn: true diff --git a/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org b/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org index dc8c5a0c45..2d3ab452ac 100644 --- a/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org +++ b/inventory/host_vars/smtp-mm-tummy01.fedoraproject.org @@ -9,3 +9,4 @@ eth0_ip: 66.35.62.164 eth0_nm: 255.255.255.248 vmhost: tummy01.fedoraproject.org datacenter: tummy +vpn: true diff --git a/inventory/host_vars/torrent02.fedoraproject.org b/inventory/host_vars/torrent02.fedoraproject.org index 27a6bf302b..c8d8bd28d7 100644 --- a/inventory/host_vars/torrent02.fedoraproject.org +++ b/inventory/host_vars/torrent02.fedoraproject.org @@ -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/ postfix_group: vpn +vpn: true vmhost: ibiblio05.fedoraproject.org datacenter: ibiblio diff --git a/inventory/host_vars/tummy01.fedoraproject.org b/inventory/host_vars/tummy01.fedoraproject.org index 0369238794..9e1d116ea6 100644 --- a/inventory/host_vars/tummy01.fedoraproject.org +++ b/inventory/host_vars/tummy01.fedoraproject.org @@ -8,3 +8,4 @@ dns: 198.49.126.1 postfix_group: vpn br0_ip: 66.35.62.161 br0_nm: 255.255.255.248 +vpn: true diff --git a/inventory/host_vars/unbound-ib01.fedoraproject.org b/inventory/host_vars/unbound-ib01.fedoraproject.org index 5733b64c69..e2a03a264b 100644 --- a/inventory/host_vars/unbound-ib01.fedoraproject.org +++ b/inventory/host_vars/unbound-ib01.fedoraproject.org @@ -10,3 +10,4 @@ eth0_nm: 255.255.255.128 vmhost: ibiblio04.fedoraproject.org datacenter: ibiblio postfix_group: vpn +vpn: true diff --git a/inventory/host_vars/unbound-osuosl01.fedoraproject.org b/inventory/host_vars/unbound-osuosl01.fedoraproject.org index 973532c516..b6655f6fad 100644 --- a/inventory/host_vars/unbound-osuosl01.fedoraproject.org +++ b/inventory/host_vars/unbound-osuosl01.fedoraproject.org @@ -10,3 +10,4 @@ eth0_nm: 255.255.255.128 vmhost: osuosl03.fedoraproject.org datacenter: osuosl postfix_group: vpn +vpn: true diff --git a/inventory/host_vars/unbound-tummy01.fedoraproject.org b/inventory/host_vars/unbound-tummy01.fedoraproject.org index ff20d9d7db..1f3554e389 100644 --- a/inventory/host_vars/unbound-tummy01.fedoraproject.org +++ b/inventory/host_vars/unbound-tummy01.fedoraproject.org @@ -9,3 +9,4 @@ eth0_ip: 66.35.62.163 eth0_nm: 255.255.255.248 vmhost: tummy01.fedoraproject.org datacenter: tummy +vpn: true diff --git a/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org b/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org index 22b8db798f..b886e4aae2 100644 --- a/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org +++ b/inventory/host_vars/virthost-cc-rdu01.fedoraproject.org @@ -7,3 +7,4 @@ br0_nm: 255.255.255.0 gw: 8.43.85.254 dns: 8.8.8.8 postfix_group: vpn +vpn: true diff --git a/inventory/host_vars/virthost-rdu01.fedoraproject.org b/inventory/host_vars/virthost-rdu01.fedoraproject.org index a87f06cbcc..ce7d73c0d0 100644 --- a/inventory/host_vars/virthost-rdu01.fedoraproject.org +++ b/inventory/host_vars/virthost-rdu01.fedoraproject.org @@ -8,3 +8,4 @@ dns: 8.8.8.8 postfix_group: vpn br0_ip: 204.85.14.4 br0_nm: 255.255.255.192 +vpn: true diff --git a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 index a27a83f461..d0af1bcafa 100644 --- a/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 +++ b/roles/nagios_server/templates/nagios/hostgroups/vpnclients.cfg.j2 @@ -5,6 +5,6 @@ define hostgroup { hostgroup_name 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 %} }