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

Drop all references to unbound-telia01 in favor of new unbound-osuosl01

Browse source
This commit is contained in:
Kevin Fenzi 2014-09-26 18:04:29 +00:00
parent 3562b050ad
commit e1563a34bb
10 changed files with 34 additions and 30 deletions
Download patch file Download diff file Expand all files Collapse all files

1
inventory/group_vars/unbound
View file

@ -7,3 +7,4 @@ tcp_ports: [ 80, 443 ]
custom_rules: [ '-A INPUT -p tcp -m tcp -s 209.132.184.0/24 --dport 53 -j ACCEPT', '-A INPUT -p udp -m udp -s 209.132.184.0/24 --dport 53 -j ACCEPT' ] custom_rules: [ '-A INPUT -p tcp -m tcp -s 209.132.184.0/24 --dport 53 -j ACCEPT', '-A INPUT -p udp -m udp -s 209.132.184.0/24 --dport 53 -j ACCEPT' ]
fas_client_groups: sysadmin-dns fas_client_groups: sysadmin-dns
freezes: false

2
inventory/group_vars/unbound-dns
View file

@ -1,2 +0,0 @@
---
freezes: false

21
inventory/host_vars/209.132.184.166
View file

@ -1,11 +1,18 @@
--- # 2cpus, 3GB of ram 20GB of ephemeral space
instance_type: m1.large instance_type: m1.large
image: "{{ f18_qcow_id }}" # image id
image: "{{ el6_qcow_id }}"
keypair: fedora-admin-20130801 keypair: fedora-admin-20130801
security_group: jenkins # what security group to add the host to
zone: nova security_group: webserver
hostbase: jenkins-f18 zone: fedoracloud
# instance id will be appended
hostbase: devpi-
# ip should be in the 209.132.184.XXX range
public_ip: 209.132.184.166 public_ip: 209.132.184.166
root_auth_users: pingou # users/groups who should have root ssh access
description: jenkins f18 worker/slave root_auth_users: bkabrda ncoghlan
description: devpi test server
freezes: false freezes: false
# 5gb persistent storage
volumes: ['-d /dev/vdb vol-0000002d']

10
inventory/host_vars/unbound-telia01.fedoraproject.org
View file

@ -1,10 +0,0 @@
---
nm: 255.255.255.240
gw: 80.239.156.209
dns: 213.248.76.210
ks_url: http://infrastructure.fedoraproject.org/repo/rhel/ks/kvm-rhel-6
ks_repo: http://infrastructure.fedoraproject.org/repo/rhel/RHEL6-x86_64/
volgroup: /dev/VolGroup00
eth0_ip: 80.239.156.220
vmhost: telia01.fedoraproject.org
datacenter: telia

3
inventory/inventory
View file

@ -549,7 +549,6 @@ taskotron-client25.qa.fedoraproject.org
[unbound] [unbound]
unbound-ib01.fedoraproject.org unbound-ib01.fedoraproject.org
unbound-telia01.fedoraproject.org
unbound-tummy01.fedoraproject.org unbound-tummy01.fedoraproject.org
unbound-osuosl01.fedoraproject.org unbound-osuosl01.fedoraproject.org
@ -637,6 +636,8 @@ bodhi.dev.fedoraproject.org
koschei.cloud.fedoraproject.org koschei.cloud.fedoraproject.org
# darkserver-dev # darkserver-dev
209.132.184.148 209.132.184.148
# DevPi test instance - ticket 4524
209.132.184.166
[jenkins-slaves] [jenkins-slaves]
# EL-6 builder # EL-6 builder

2
roles/nagios_server/files/nagios/hostgroups/unbound.cfg
View file

@ -5,5 +5,5 @@
define hostgroup { define hostgroup {
hostgroup_name unboundservers hostgroup_name unboundservers
alias Unbound Servers alias Unbound Servers
members unbound-tummy01, unbound-ib01, unbound-telia01 members unbound-tummy01, unbound-ib01, unbound-osuosl01
} }

2
roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg
View file

@ -5,5 +5,5 @@
define hostgroup { define hostgroup {
hostgroup_name vpnclients hostgroup_name vpnclients
alias vpnclients alias vpnclients
members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,telia01,unbound-telia01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01 members tummy01,unbound-tummy01,smtp-mm-tummy01,proxy03,telia01,unbound-osuosl01,bodhost01,proxy07,coloamer01,proxy08,ibiblio01,download-ib02,noc02,unbound-ib01,ibiblio02,ns02,proxy04,smtp-mm-ib01,torrent02,ibiblio03,ibiblio04,backup02,people03,internetx01,hosted-lists01,ns05,proxy02,osuosl01,proxy06,osuosl02,hosted03,ibiblio02,hosted04,serverbeach08,serverbeach09,ns-sb01,serverbeach10,collab03,collab04,proxy09,smtp-mm-coloamer01
} }

7
roles/nagios_server/files/nagios/hosts/unbound-osuosl01.cfg Normal file
View file

@ -0,0 +1,7 @@
define host {
host_name unbound-osuosl01
alias unbound-osuosl01.fedoraproject.org
use defaulttemplate
address unbound-osuosl01.fedoraproject.org
parents osuosl03
}

14
roles/nagios_server/files/nagios/hosts/unbound-telia01.cfg
View file

@ -1,7 +1,7 @@
define host { #define host {
host_name unbound-telia01 # host_name unbound-telia01
alias unbound-telia01.fedoraproject.org # alias unbound-telia01.fedoraproject.org
use defaulttemplate # use defaulttemplate
address unbound-telia01.fedoraproject.org # address unbound-telia01.fedoraproject.org
parents telia01 # parents telia01
} #}

2
roles/nagios_server/files/nagios/services/unbound.cfg
View file

@ -20,7 +20,7 @@ define service {
} }
define service { define service {
host_name unbound-telia01 host_name unbound-osuosl01
service_description Unbound 443/tcp service_description Unbound 443/tcp
check_command check_unbound_443!8883!www.fedoraproject.org check_command check_unbound_443!8883!www.fedoraproject.org
use defaulttemplate use defaulttemplate