diff --git a/inventory/group_vars/unbound b/inventory/group_vars/unbound index 65cc771e6e..e8bdb57041 100644 --- a/inventory/group_vars/unbound +++ b/inventory/group_vars/unbound @@ -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' ] fas_client_groups: sysadmin-dns +freezes: false diff --git a/inventory/group_vars/unbound-dns b/inventory/group_vars/unbound-dns deleted file mode 100644 index 3d8f2c30da..0000000000 --- a/inventory/group_vars/unbound-dns +++ /dev/null @@ -1,2 +0,0 @@ ---- -freezes: false diff --git a/inventory/host_vars/209.132.184.166 b/inventory/host_vars/209.132.184.166 index b0f2cff557..9d416060b2 100644 --- a/inventory/host_vars/209.132.184.166 +++ b/inventory/host_vars/209.132.184.166 @@ -1,11 +1,18 @@ ---- +# 2cpus, 3GB of ram 20GB of ephemeral space instance_type: m1.large -image: "{{ f18_qcow_id }}" +# image id +image: "{{ el6_qcow_id }}" keypair: fedora-admin-20130801 -security_group: jenkins -zone: nova -hostbase: jenkins-f18 +# what security group to add the host to +security_group: webserver +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 -root_auth_users: pingou -description: jenkins f18 worker/slave +# users/groups who should have root ssh access +root_auth_users: bkabrda ncoghlan +description: devpi test server freezes: false +# 5gb persistent storage +volumes: ['-d /dev/vdb vol-0000002d'] diff --git a/inventory/host_vars/unbound-telia01.fedoraproject.org b/inventory/host_vars/unbound-telia01.fedoraproject.org deleted file mode 100644 index eff1ba2a92..0000000000 --- a/inventory/host_vars/unbound-telia01.fedoraproject.org +++ /dev/null @@ -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 diff --git a/inventory/inventory b/inventory/inventory index 0e55050cf5..168eae6d19 100644 --- a/inventory/inventory +++ b/inventory/inventory @@ -549,7 +549,6 @@ taskotron-client25.qa.fedoraproject.org [unbound] unbound-ib01.fedoraproject.org -unbound-telia01.fedoraproject.org unbound-tummy01.fedoraproject.org unbound-osuosl01.fedoraproject.org @@ -637,6 +636,8 @@ bodhi.dev.fedoraproject.org koschei.cloud.fedoraproject.org # darkserver-dev 209.132.184.148 +# DevPi test instance - ticket 4524 +209.132.184.166 [jenkins-slaves] # EL-6 builder diff --git a/roles/nagios_server/files/nagios/hostgroups/unbound.cfg b/roles/nagios_server/files/nagios/hostgroups/unbound.cfg index a018c16700..778eb32708 100644 --- a/roles/nagios_server/files/nagios/hostgroups/unbound.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/unbound.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name unboundservers alias Unbound Servers - members unbound-tummy01, unbound-ib01, unbound-telia01 + members unbound-tummy01, unbound-ib01, unbound-osuosl01 } diff --git a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg index b5f45370b2..cf5f0b43a3 100644 --- a/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg +++ b/roles/nagios_server/files/nagios/hostgroups/vpnclients.cfg @@ -5,5 +5,5 @@ define hostgroup { hostgroup_name 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 } diff --git a/roles/nagios_server/files/nagios/hosts/unbound-osuosl01.cfg b/roles/nagios_server/files/nagios/hosts/unbound-osuosl01.cfg new file mode 100644 index 0000000000..23dd1dac72 --- /dev/null +++ b/roles/nagios_server/files/nagios/hosts/unbound-osuosl01.cfg @@ -0,0 +1,7 @@ +define host { + host_name unbound-osuosl01 + alias unbound-osuosl01.fedoraproject.org + use defaulttemplate + address unbound-osuosl01.fedoraproject.org + parents osuosl03 +} diff --git a/roles/nagios_server/files/nagios/hosts/unbound-telia01.cfg b/roles/nagios_server/files/nagios/hosts/unbound-telia01.cfg index f7c3210649..5fe79b9527 100644 --- a/roles/nagios_server/files/nagios/hosts/unbound-telia01.cfg +++ b/roles/nagios_server/files/nagios/hosts/unbound-telia01.cfg @@ -1,7 +1,7 @@ -define host { - host_name unbound-telia01 - alias unbound-telia01.fedoraproject.org - use defaulttemplate - address unbound-telia01.fedoraproject.org - parents telia01 -} +#define host { +# host_name unbound-telia01 +# alias unbound-telia01.fedoraproject.org +# use defaulttemplate +# address unbound-telia01.fedoraproject.org +# parents telia01 +#} diff --git a/roles/nagios_server/files/nagios/services/unbound.cfg b/roles/nagios_server/files/nagios/services/unbound.cfg index 3bff0d7465..6a715016cd 100644 --- a/roles/nagios_server/files/nagios/services/unbound.cfg +++ b/roles/nagios_server/files/nagios/services/unbound.cfg @@ -20,7 +20,7 @@ define service { } define service { - host_name unbound-telia01 + host_name unbound-osuosl01 service_description Unbound 443/tcp check_command check_unbound_443!8883!www.fedoraproject.org use defaulttemplate