diff --git a/inventory/group_vars/ask b/inventory/group_vars/ask index ceb4790bf2..4e6a5a4c7d 100644 --- a/inventory/group_vars/ask +++ b/inventory/group_vars/ask @@ -13,7 +13,7 @@ tcp_ports: [ 80, 443, # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/ask-stg b/inventory/group_vars/ask-stg index ceb4790bf2..4e6a5a4c7d 100644 --- a/inventory/group_vars/ask-stg +++ b/inventory/group_vars/ask-stg @@ -13,7 +13,7 @@ tcp_ports: [ 80, 443, # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/bastion b/inventory/group_vars/bastion index 031a10f034..a07d8f7a30 100644 --- a/inventory/group_vars/bastion +++ b/inventory/group_vars/bastion @@ -21,7 +21,7 @@ custom_rules: [ # # allow a bunch of sysadmin groups here so they can access internal stuff # -fas_client_groups: sysadmin-ask,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-darkserver,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg +fas_client_groups: sysadmin-ask,sysadmin-web,sysadmin-main,sysadmin-cvs,sysadmin-build,sysadmin-noc,sysadmin-releng,sysadmin-dba,sysadmin-hosted,sysadmin-tools,sysadmin-spin,sysadmin-cloud,fi-apprentice,sysadmin-darkserver,sysadmin-badges,sysadmin-troubleshoot,sysadmin-qa,sysadmin-centos,sysadmin-ppc,sysadmin-koschei,sysadmin-secondary,sysadmin-fedimg,sysadmin-veteran # # This is a postfix gateway. This will pick up gateway postfix config in base diff --git a/inventory/group_vars/batcave b/inventory/group_vars/batcave index 8b3d0a55d4..8712ada7b0 100644 --- a/inventory/group_vars/batcave +++ b/inventory/group_vars/batcave @@ -8,7 +8,7 @@ tcp_ports: [ 80, 443 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-ask,sysadmin-build,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges +fas_client_groups: sysadmin-ask,sysadmin-build,sysadmin-cvs,sysadmin-main,sysadmin-web,sysadmin-noc,sysadmin-hosted,sysadmin-releng,sysadmin-qa,sysadmin-tools,sysadmin-cloud,sysadmin-bot,sysadmin-centos,sysadmin-koschei,sysadmin-datanommer,sysadmin-fedimg,fi-apprentice,sysadmin-regcfp,sysadmin-badges,sysadmin-veteran ansible_base: /srv/web/infra freezes: false diff --git a/inventory/group_vars/beaker b/inventory/group_vars/beaker index aa5d47262c..1b9c597141 100644 --- a/inventory/group_vars/beaker +++ b/inventory/group_vars/beaker @@ -5,7 +5,7 @@ num_cpus: 2 tcp_ports: [ 80, 443, 8000 ] udp_ports: [ 69 ] -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran nrpe_procs_warn: 250 nrpe_procs_crit: 300 diff --git a/inventory/group_vars/beaker-stg b/inventory/group_vars/beaker-stg index a7a9109079..f66f2e0f49 100644 --- a/inventory/group_vars/beaker-stg +++ b/inventory/group_vars/beaker-stg @@ -5,7 +5,7 @@ num_cpus: 2 tcp_ports: [ 80, 443, 8000 ] udp_ports: [ 69 ] -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran nrpe_procs_warn: 250 nrpe_procs_crit: 300 diff --git a/inventory/group_vars/blockerbugs b/inventory/group_vars/blockerbugs index 54733bed96..7fd6bdf3d7 100644 --- a/inventory/group_vars/blockerbugs +++ b/inventory/group_vars/blockerbugs @@ -11,7 +11,7 @@ tcp_ports: [ 80, 443, 8888 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-qa +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-qa,sysadmin-veteran sudoers: "{{ private }}/files/sudo/qadevel-sudoers" # This gets overridden by whichever node we want to run special cronjobs. diff --git a/inventory/group_vars/blockerbugs-stg b/inventory/group_vars/blockerbugs-stg index e9bad8066a..208b9bfc23 100644 --- a/inventory/group_vars/blockerbugs-stg +++ b/inventory/group_vars/blockerbugs-stg @@ -11,7 +11,7 @@ tcp_ports: [ 80, 443, 8888 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-qa +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-qa,sysadmin-veteran sudoers: "{{ private }}/files/sudo/qadevel-sudoers" # This gets overridden by whichever node we want to run special cronjobs. diff --git a/inventory/group_vars/darkserver b/inventory/group_vars/darkserver index db9a89d6ad..31765e9afc 100644 --- a/inventory/group_vars/darkserver +++ b/inventory/group_vars/darkserver @@ -6,6 +6,6 @@ num_cpus: 8 tcp_ports: [ 80, 443 ] -fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/darkserver-backend-stg b/inventory/group_vars/darkserver-backend-stg index 5e64969564..929e841592 100644 --- a/inventory/group_vars/darkserver-backend-stg +++ b/inventory/group_vars/darkserver-backend-stg @@ -6,6 +6,6 @@ num_cpus: 2 tcp_ports: [] -fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/darkserver-web-stg b/inventory/group_vars/darkserver-web-stg index a6fc5a2548..92afc1a065 100644 --- a/inventory/group_vars/darkserver-web-stg +++ b/inventory/group_vars/darkserver-web-stg @@ -6,6 +6,6 @@ num_cpus: 2 tcp_ports: [ 80, 443 ] -fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-darkserver,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/datagrepper b/inventory/group_vars/datagrepper index c1395a125a..72a21caa96 100644 --- a/inventory/group_vars/datagrepper +++ b/inventory/group_vars/datagrepper @@ -14,6 +14,6 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -fas_client_groups: sysadmin-noc,sysadmin-datanommer,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-datanommer,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/datagrepper-stg b/inventory/group_vars/datagrepper-stg index c5d3090734..4650831c99 100644 --- a/inventory/group_vars/datagrepper-stg +++ b/inventory/group_vars/datagrepper-stg @@ -11,6 +11,6 @@ tcp_ports: [ 80, 443, 6996 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-datanommer,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-datanommer,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/dhcp b/inventory/group_vars/dhcp index 945cbb5c1f..061b46bc43 100644 --- a/inventory/group_vars/dhcp +++ b/inventory/group_vars/dhcp @@ -10,4 +10,4 @@ num_cpus: 1 tcp_ports: [ 68 ] udp_ports: [ 69 ] -fas_client_groups: sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-veteran diff --git a/inventory/group_vars/elections b/inventory/group_vars/elections index 4678bf7004..a11c4bc13d 100644 --- a/inventory/group_vars/elections +++ b/inventory/group_vars/elections @@ -13,7 +13,7 @@ tcp_ports: [ 80 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/elections-stg b/inventory/group_vars/elections-stg index 2ebaf09fc9..307ffc2ed4 100644 --- a/inventory/group_vars/elections-stg +++ b/inventory/group_vars/elections-stg @@ -13,7 +13,7 @@ tcp_ports: [ 80 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/fedimg-stg b/inventory/group_vars/fedimg-stg index c6c80c9fdd..22eea74296 100644 --- a/inventory/group_vars/fedimg-stg +++ b/inventory/group_vars/fedimg-stg @@ -13,7 +13,7 @@ tcp_ports: [ ] # TODO, restrict this down to just sysadmin-releng -fas_client_groups: sysadmin-datanommer,sysadmin-releng,sysadmin-fedimg,fi-apprentice +fas_client_groups: sysadmin-datanommer,sysadmin-releng,sysadmin-fedimg,fi-apprentice,sysadmin-noc,sysadmin-veteran # These people get told when something goes wrong. fedmsg_error_recipients: diff --git a/inventory/group_vars/infinote b/inventory/group_vars/infinote index 73742aa810..63adc7e9d9 100644 --- a/inventory/group_vars/infinote +++ b/inventory/group_vars/infinote @@ -15,7 +15,7 @@ custom_rules: [ tcp_ports: [443, 6523, 9418] -fas_client_groups: sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/koji-stg b/inventory/group_vars/koji-stg index ef00ba0547..cd03391731 100644 --- a/inventory/group_vars/koji-stg +++ b/inventory/group_vars/koji-stg @@ -12,7 +12,7 @@ tcp_ports: [ 80, 443, 111, 2049, udp_ports: [ 111, 2049 ] -fas_client_groups: sysadmin-releng,fi-apprentice +fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/group_vars/koschei b/inventory/group_vars/koschei index 542ffa5744..91d7708d7f 100644 --- a/inventory/group_vars/koschei +++ b/inventory/group_vars/koschei @@ -28,7 +28,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -fas_client_groups: sysadmin-koschei,fi-apprentice +fas_client_groups: sysadmin-koschei,fi-apprentice,sysadmin-noc,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/koschei-backend b/inventory/group_vars/koschei-backend index 98c28af9b7..46542b37da 100644 --- a/inventory/group_vars/koschei-backend +++ b/inventory/group_vars/koschei-backend @@ -26,7 +26,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -fas_client_groups: sysadmin-koschei,fi-apprentice +fas_client_groups: sysadmin-koschei,fi-apprentice,sysadmin-noc,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/koschei-backend-stg b/inventory/group_vars/koschei-backend-stg index f818239ed6..8af22bcd21 100644 --- a/inventory/group_vars/koschei-backend-stg +++ b/inventory/group_vars/koschei-backend-stg @@ -26,7 +26,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -fas_client_groups: sysadmin-koschei,fi-apprentice +fas_client_groups: sysadmin-koschei,fi-apprentice,sysadmin-noc,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/koschei-web b/inventory/group_vars/koschei-web index 6e0967e450..26f9070368 100644 --- a/inventory/group_vars/koschei-web +++ b/inventory/group_vars/koschei-web @@ -25,7 +25,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -fas_client_groups: sysadmin-koschei,fi-apprentice +fas_client_groups: sysadmin-koschei,fi-apprentice,sysadmin-noc,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/koschei-web-stg b/inventory/group_vars/koschei-web-stg index 914a3c25d7..29d2f0f3ed 100644 --- a/inventory/group_vars/koschei-web-stg +++ b/inventory/group_vars/koschei-web-stg @@ -26,7 +26,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT', ] -fas_client_groups: sysadmin-koschei,fi-apprentice +fas_client_groups: sysadmin-koschei,fi-apprentice,sysadmin-noc,sysadmin-veteran freezes: false diff --git a/inventory/group_vars/lockbox b/inventory/group_vars/lockbox index 76786745be..338338af4a 100644 --- a/inventory/group_vars/lockbox +++ b/inventory/group_vars/lockbox @@ -6,7 +6,7 @@ num_cpus: 2 tcp_ports: [ 443 ] -fas_client_groups: sysadmin-noc,sysadmin-qa,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-qa,fi-apprentice,sysadmin-veteran # These are consumed by a task in roles/fedmsg/base/main.yml # We don't really use the announce cert.. but it was supposed to be a way for diff --git a/inventory/group_vars/memcached b/inventory/group_vars/memcached index 581a0248b4..ea47085a7a 100644 --- a/inventory/group_vars/memcached +++ b/inventory/group_vars/memcached @@ -9,4 +9,4 @@ num_cpus: 1 tcp_ports: [ 11211 ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran diff --git a/inventory/group_vars/memcached-stg b/inventory/group_vars/memcached-stg index 581a0248b4..ea47085a7a 100644 --- a/inventory/group_vars/memcached-stg +++ b/inventory/group_vars/memcached-stg @@ -9,4 +9,4 @@ num_cpus: 1 tcp_ports: [ 11211 ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran diff --git a/inventory/group_vars/mirrorlist2 b/inventory/group_vars/mirrorlist2 index 9d5a2f2a47..4f86e8dad8 100644 --- a/inventory/group_vars/mirrorlist2 +++ b/inventory/group_vars/mirrorlist2 @@ -19,7 +19,7 @@ custom6_rules: [ '-A INPUT -p tcp -m tcp -s 2610:28:3090:3001:dead:beef:cafe:fed '-A INPUT -p tcp -m tcp -s 2a00:d1a0:1::131 --dport 443 -j ACCEPT', ] collectd_apache: true -fas_client_groups: sysadmin-web,sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-web,sysadmin-noc,fi-apprentice,sysadmin-veteran nrpe_procs_warn: 1200 nrpe_procs_crit: 1400 # By default run 45 wsgi procs diff --git a/inventory/group_vars/mirrorlist2-stg b/inventory/group_vars/mirrorlist2-stg index 257013a545..ba08339d3d 100644 --- a/inventory/group_vars/mirrorlist2-stg +++ b/inventory/group_vars/mirrorlist2-stg @@ -10,7 +10,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 192.168.0.0/16 --dport 80 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 10.5.126.0/24 --dport 443 -j ACCEPT' ] collectd_apache: true -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran nrpe_procs_warn: 500 nrpe_procs_crit: 600 # By default run 45 wsgi procs diff --git a/inventory/group_vars/newhosted b/inventory/group_vars/newhosted index 6a1b0bb2f2..91cf319b26 100644 --- a/inventory/group_vars/newhosted +++ b/inventory/group_vars/newhosted @@ -9,7 +9,7 @@ num_cpus: 4 tcp_ports: [ 22, 25, 80, 443 ] -fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice,sysadmin-hosted,sysadmin-veteran freezes: false postfix_group: vpn diff --git a/inventory/group_vars/osbs-stg b/inventory/group_vars/osbs-stg index f85721145f..6a45854e7a 100644 --- a/inventory/group_vars/osbs-stg +++ b/inventory/group_vars/osbs-stg @@ -6,7 +6,7 @@ num_cpus: 2 tcp_ports: [ 80, 443, 8443] -fas_client_groups: sysadmin-releng,fi-apprentice +fas_client_groups: sysadmin-releng,fi-apprentice,sysadmin-noc,sysadmin-veteran sudoers: "{{ private }}/files/sudo/00releng-sudoers" docker_cert_dir: "/etc/docker/certs.d/registry.stg.fedoraproject.org" diff --git a/inventory/group_vars/paste b/inventory/group_vars/paste index 5165627096..7177de8e41 100644 --- a/inventory/group_vars/paste +++ b/inventory/group_vars/paste @@ -12,6 +12,6 @@ tcp_ports: [ 80, 443, 8888 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-paste,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-paste,fi-apprentice,sysadmin-veteran # This host doesn't freeze freezes: false diff --git a/inventory/group_vars/paste-stg b/inventory/group_vars/paste-stg index 5165627096..7177de8e41 100644 --- a/inventory/group_vars/paste-stg +++ b/inventory/group_vars/paste-stg @@ -12,6 +12,6 @@ tcp_ports: [ 80, 443, 8888 ] # Neeed for rsync from log01 for logs. custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.13 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.59 --dport 873 -j ACCEPT' ] -fas_client_groups: sysadmin-noc,sysadmin-paste,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-paste,fi-apprentice,sysadmin-veteran # This host doesn't freeze freezes: false diff --git a/inventory/group_vars/proxies b/inventory/group_vars/proxies index 2a4c1d0b6b..dab3b24c74 100644 --- a/inventory/group_vars/proxies +++ b/inventory/group_vars/proxies @@ -65,7 +65,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp --dport 9941 -s 10.5.131.71 -j ACCEPT', ] -fas_client_groups: sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran collectd_apache: true diff --git a/inventory/group_vars/proxies-stg b/inventory/group_vars/proxies-stg index 3b081ed36b..0594aff5c9 100644 --- a/inventory/group_vars/proxies-stg +++ b/inventory/group_vars/proxies-stg @@ -70,7 +70,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp --dport 9941 -s 10.5.131.72 -j ACCEPT', ] -fas_client_groups: sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran collectd_apache: true diff --git a/inventory/group_vars/qa-stg b/inventory/group_vars/qa-stg index 8495470b0b..8d19dd6059 100644 --- a/inventory/group_vars/qa-stg +++ b/inventory/group_vars/qa-stg @@ -7,7 +7,7 @@ num_cpus: 1 # for systems that do not match the above - specify the same parameter in # the host_vars/$hostname file -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran # this enables infrastructure-testing repo diff --git a/inventory/group_vars/secondary b/inventory/group_vars/secondary index 1da9b210b1..6234399261 100644 --- a/inventory/group_vars/secondary +++ b/inventory/group_vars/secondary @@ -8,6 +8,6 @@ nrpe_procs_crit: 1000 # nfs mount options, overrides the all/default nfs_mount_opts: "ro,hard,bg,intr,noatime,nodev,nosuid,actimeo=600,nfsvers=4" -fas_client_groups: sysadmin-noc,alt-sugar,alt-k12linux,altvideos,hosted-content,mips-content,s390_content,fi-apprentice,qa-deltaisos +fas_client_groups: sysadmin-noc,alt-sugar,alt-k12linux,altvideos,hosted-content,mips-content,s390_content,fi-apprentice,qa-deltaisos,sysadmin-veteran host_group: secondary diff --git a/inventory/group_vars/smtp-mm b/inventory/group_vars/smtp-mm index 510826f73d..787cb121cf 100644 --- a/inventory/group_vars/smtp-mm +++ b/inventory/group_vars/smtp-mm @@ -9,7 +9,7 @@ num_cpus: 2 tcp_ports: [ 25 ] -fas_client_groups: sysadmin-noc,sysadmin-tools,fi-apprentice +fas_client_groups: sysadmin-noc,sysadmin-tools,fi-apprentice,sysadmin-veteran postfix_transport_filename: transports.mm-smtp postfix_group: smtp-mm diff --git a/inventory/group_vars/sundries b/inventory/group_vars/sundries index 6f294078ef..3f11362298 100644 --- a/inventory/group_vars/sundries +++ b/inventory/group_vars/sundries @@ -8,7 +8,7 @@ num_cpus: 2 # the host_vars/$hostname file tcp_ports: [ 80, 873 ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran # This gets overridden by whichever node we want to run special cronjobs. master_sundries_node: False diff --git a/inventory/group_vars/sundries-stg b/inventory/group_vars/sundries-stg index 6f294078ef..3f11362298 100644 --- a/inventory/group_vars/sundries-stg +++ b/inventory/group_vars/sundries-stg @@ -8,7 +8,7 @@ num_cpus: 2 # the host_vars/$hostname file tcp_ports: [ 80, 873 ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran # This gets overridden by whichever node we want to run special cronjobs. master_sundries_node: False diff --git a/inventory/group_vars/taskotron-dev b/inventory/group_vars/taskotron-dev index 2c05d68950..90e6dfca14 100644 --- a/inventory/group_vars/taskotron-dev +++ b/inventory/group_vars/taskotron-dev @@ -3,7 +3,7 @@ # general information ############################################################ -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice,sysadmin-noc,sysadmin-veteran tcp_ports: [ 80, 443, "{{ buildslave_port }}" ] freezes: false diff --git a/inventory/group_vars/torrent b/inventory/group_vars/torrent index 5256869ef0..36efa42484 100644 --- a/inventory/group_vars/torrent +++ b/inventory/group_vars/torrent @@ -7,7 +7,7 @@ num_cpus: 2 tcp_ports: [ 53, 80, 443, 873, "6881:6999" ] udp_ports: [ 53 ] -fas_client_groups: sysadmin-web,torrentadmin,sysadmin-noc,torrent-cc,fi-apprentice +fas_client_groups: sysadmin-web,torrentadmin,sysadmin-noc,torrent-cc,fi-apprentice,sysadmin-veteran nrpe_procs_warn: 300 nrpe_procs_crit: 500 diff --git a/inventory/group_vars/value b/inventory/group_vars/value index 0ac0b6bd75..d6595f580f 100644 --- a/inventory/group_vars/value +++ b/inventory/group_vars/value @@ -23,7 +23,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.23 --dport 5050 -j ACCEPT', ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-mote +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-mote,sysadmin-veteran # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/group_vars/value-stg b/inventory/group_vars/value-stg index c267d39fa2..8a57c88bdf 100644 --- a/inventory/group_vars/value-stg +++ b/inventory/group_vars/value-stg @@ -23,7 +23,7 @@ custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.23 --dport 5050 -j ACCEPT', ] -fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-mote +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-mote,sysadmin-veteran # These are consumed by a task in roles/fedmsg/base/main.yml fedmsg_certs: diff --git a/inventory/group_vars/wiki b/inventory/group_vars/wiki index fd4c06f99d..54982708c3 100644 --- a/inventory/group_vars/wiki +++ b/inventory/group_vars/wiki @@ -9,7 +9,7 @@ num_cpus: 4 virt_install_command: "{{ virt_install_command_rhel6 }}" tcp_ports: [ 80 ] -fas_client_groups: sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran # mediawiki variables wikiname: "fp" diff --git a/inventory/group_vars/wiki-stg b/inventory/group_vars/wiki-stg index f2741b8025..eaff309139 100644 --- a/inventory/group_vars/wiki-stg +++ b/inventory/group_vars/wiki-stg @@ -9,7 +9,7 @@ num_cpus: 2 virt_install_command: "{{ virt_install_command_rhel6 }}" tcp_ports: [ 80 ] -fas_client_groups: sysadmin-noc,fi-apprentice +fas_client_groups: sysadmin-noc,fi-apprentice,sysadmin-web,sysadmin-veteran # mediawiki variables wikiname: "fp" diff --git a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org index fce320e99a..6011419862 100644 --- a/inventory/host_vars/aarch64-02a.arm.fedoraproject.org +++ b/inventory/host_vars/aarch64-02a.arm.fedoraproject.org @@ -1,4 +1,4 @@ -fas_client_groups: sysadmin-noc,sysadmin-releng +fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-veteran kojipkgs_url: armpkgs.fedoraproject.org kojihub_url: arm.koji.fedoraproject.org/kojihub diff --git a/inventory/host_vars/arm-koji01.qa.fedoraproject.org b/inventory/host_vars/arm-koji01.qa.fedoraproject.org index d23aef7e78..74d686d121 100644 --- a/inventory/host_vars/arm-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/arm-koji01.qa.fedoraproject.org @@ -11,7 +11,7 @@ datacenter: phx2 nrpe_procs_warn: 900 nrpe_procs_crit: 1000 -fas_client_groups: sysadmin-noc,sysadmin-secondary +fas_client_groups: sysadmin-noc,sysadmin-secondary,sysadmin-veteran fedmsg_fqdn: arm-koji01.qa.fedoraproject.org diff --git a/inventory/host_vars/bastion-comm01.qa.fedoraproject.org b/inventory/host_vars/bastion-comm01.qa.fedoraproject.org index 02130f7021..fac95dea84 100644 --- a/inventory/host_vars/bastion-comm01.qa.fedoraproject.org +++ b/inventory/host_vars/bastion-comm01.qa.fedoraproject.org @@ -12,4 +12,4 @@ eth0_nm: 255.255.255.128 vmhost: virthost-comm03.qa.fedoraproject.org datacenter: phx2 -fas_client_groups: sysadmin-main,sysadmin-noc,sysadmin-qa,fi-apprentice,sysadmin-releng,sysadmin-kernel,arm-qa,sysadmin-centos,qa-automation-shell,sysadmin-troubleshoot,sysadmin-atomic,sysadmin-ppc +fas_client_groups: sysadmin-main,sysadmin-noc,sysadmin-qa,fi-apprentice,sysadmin-veteran,sysadmin-releng,sysadmin-kernel,arm-qa,sysadmin-centos,qa-automation-shell,sysadmin-troubleshoot,sysadmin-atomic,sysadmin-ppc diff --git a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org index c077e428c6..9401f189e2 100644 --- a/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org +++ b/inventory/host_vars/compose-x86-01.phx2.fedoraproject.org @@ -22,7 +22,7 @@ eth1_gw: 10.5.127.254 vmhost: bvirthost10.phx2.fedoraproject.org datacenter: phx2 -fas_client_groups: sysadmin-noc,sysadmin-releng +fas_client_groups: sysadmin-noc,sysadmin-releng,sysadmin-veteran koji_hub_nfs: "fedora_koji" diff --git a/inventory/host_vars/db-arm-koji01.qa.fedoraproject.org b/inventory/host_vars/db-arm-koji01.qa.fedoraproject.org index 3aa1bf021c..3af15ce194 100644 --- a/inventory/host_vars/db-arm-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/db-arm-koji01.qa.fedoraproject.org @@ -22,7 +22,7 @@ dbs_to_backup: lvm_size: 500000 mem_size: 8192 num_cpus: 12 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-secondary +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-secondary,sysadmin-veteran sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" # kernel SHMMAX value diff --git a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org index 8ac9d7c937..d69dd1e828 100644 --- a/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org +++ b/inventory/host_vars/db-datanommer02.phx2.fedoraproject.org @@ -22,7 +22,7 @@ lvm_size: 500000 mem_size: 16384 num_cpus: 8 tcp_ports: [ 5432, 443 ] -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # kernel SHMMAX value kernel_shmmax: 68719476736 diff --git a/inventory/host_vars/db-fas01.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.phx2.fedoraproject.org index f2777a689e..4d4c7976aa 100644 --- a/inventory/host_vars/db-fas01.phx2.fedoraproject.org +++ b/inventory/host_vars/db-fas01.phx2.fedoraproject.org @@ -22,7 +22,7 @@ dbs_to_backup: lvm_size: 100000 mem_size: 8192 num_cpus: 4 -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # # Only allow postgresql access from the frontend nodes and hosted. diff --git a/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org b/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org index b67fe110bd..43c130d124 100644 --- a/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db-fas01.stg.phx2.fedoraproject.org @@ -22,7 +22,7 @@ dbs_to_backup: lvm_size: 30000 mem_size: 4096 num_cpus: 2 -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # # Only allow postgresql access from the frontend node and ipsilon01.stg diff --git a/inventory/host_vars/db-koji01.phx2.fedoraproject.org b/inventory/host_vars/db-koji01.phx2.fedoraproject.org index 78a184bb0c..7c550ff6f0 100644 --- a/inventory/host_vars/db-koji01.phx2.fedoraproject.org +++ b/inventory/host_vars/db-koji01.phx2.fedoraproject.org @@ -22,7 +22,7 @@ dbs_to_backup: lvm_size: 300000 mem_size: 32768 num_cpus: 16 -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # kernel SHMMAX value kernel_shmmax: 68719476736 diff --git a/inventory/host_vars/db-ppc-koji01.ppc.fedoraproject.org b/inventory/host_vars/db-ppc-koji01.ppc.fedoraproject.org index f7e111cb5a..64f2d3c4d8 100644 --- a/inventory/host_vars/db-ppc-koji01.ppc.fedoraproject.org +++ b/inventory/host_vars/db-ppc-koji01.ppc.fedoraproject.org @@ -21,7 +21,7 @@ databases: dbs_to_backup: - koji -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-releng +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-releng,sysadmin-veteran sudoers: "{{ private }}/files/sudo/00releng-sudoers" # These are normally group variables, but in this case db servers are often different diff --git a/inventory/host_vars/db-qa01.qa.fedoraproject.org b/inventory/host_vars/db-qa01.qa.fedoraproject.org index f6614450a9..7c122346f4 100644 --- a/inventory/host_vars/db-qa01.qa.fedoraproject.org +++ b/inventory/host_vars/db-qa01.qa.fedoraproject.org @@ -42,7 +42,7 @@ lvm_size: 300000 mem_size: 8192 num_cpus: 2 tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-qa,sysadmin-noc +fas_client_groups: sysadmin-qa,sysadmin-noc,sysadmin-veteran # kernel SHMMAX value kernel_shmmax: 68719476736 diff --git a/inventory/host_vars/db-s390-koji01.qa.fedoraproject.org b/inventory/host_vars/db-s390-koji01.qa.fedoraproject.org index 552030b6b7..638e6fe26f 100644 --- a/inventory/host_vars/db-s390-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/db-s390-koji01.qa.fedoraproject.org @@ -22,7 +22,7 @@ dbs_to_backup: lvm_size: 500000 mem_size: 25165 num_cpus: 12 -fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-secondary +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-secondary,sysadmin-veteran sudoers: "{{ private }}/files/sudo/sysadmin-secondary-sudoers" # kernel SHMMAX value diff --git a/inventory/host_vars/db01.phx2.fedoraproject.org b/inventory/host_vars/db01.phx2.fedoraproject.org index a3a4f8e811..b05a43e440 100644 --- a/inventory/host_vars/db01.phx2.fedoraproject.org +++ b/inventory/host_vars/db01.phx2.fedoraproject.org @@ -62,7 +62,7 @@ dbs_to_backup: lvm_size: 300000 mem_size: 16384 num_cpus: 10 -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # # We should narrow this down at some point diff --git a/inventory/host_vars/db01.stg.phx2.fedoraproject.org b/inventory/host_vars/db01.stg.phx2.fedoraproject.org index a023488f58..fa41daa8c4 100644 --- a/inventory/host_vars/db01.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db01.stg.phx2.fedoraproject.org @@ -31,7 +31,7 @@ databases: lvm_size: 300000 mem_size: 16384 num_cpus: 4 -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # # We should narrow this down at some point diff --git a/inventory/host_vars/db03.phx2.fedoraproject.org b/inventory/host_vars/db03.phx2.fedoraproject.org index 566c76dc58..c2c01ae340 100644 --- a/inventory/host_vars/db03.phx2.fedoraproject.org +++ b/inventory/host_vars/db03.phx2.fedoraproject.org @@ -29,7 +29,7 @@ lvm_size: 300000 mem_size: 8192 num_cpus: 2 tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # kernel SHMMAX value kernel_shmmax: 68719476736 diff --git a/inventory/host_vars/db03.stg.phx2.fedoraproject.org b/inventory/host_vars/db03.stg.phx2.fedoraproject.org index 16c1b0724f..344260c540 100644 --- a/inventory/host_vars/db03.stg.phx2.fedoraproject.org +++ b/inventory/host_vars/db03.stg.phx2.fedoraproject.org @@ -23,7 +23,7 @@ lvm_size: 300000 mem_size: 8192 num_cpus: 2 tcp_ports: [ 5432, 443, 3306 ] -fas_client_groups: sysadmin-dba,sysadmin-noc +fas_client_groups: sysadmin-dba,sysadmin-noc,sysadmin-veteran # kernel SHMMAX value kernel_shmmax: 68719476736 diff --git a/inventory/host_vars/log01.phx2.fedoraproject.org b/inventory/host_vars/log01.phx2.fedoraproject.org index dd32152955..15de10cd6e 100644 --- a/inventory/host_vars/log01.phx2.fedoraproject.org +++ b/inventory/host_vars/log01.phx2.fedoraproject.org @@ -20,6 +20,6 @@ lvm_size: 32768 mem_size: 16384 num_cpus: 16 -fas_client_groups: fi-apprentice,sysadmin-logs,sysadmin-noc +fas_client_groups: fi-apprentice,sysadmin-veteran,sysadmin-logs,sysadmin-noc host_backup_targets: ['/var/log'] diff --git a/inventory/host_vars/openqa-stg01.qa.fedoraproject.org b/inventory/host_vars/openqa-stg01.qa.fedoraproject.org index 34c26cf5d1..37c7ab2ad4 100644 --- a/inventory/host_vars/openqa-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/openqa-stg01.qa.fedoraproject.org @@ -22,7 +22,7 @@ datacenter: phx2 # virtual machine ############################################################ -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran lvm_size: 768000 mem_size: 4096 diff --git a/inventory/host_vars/openqa01.qa.fedoraproject.org b/inventory/host_vars/openqa01.qa.fedoraproject.org index 11dfc95cac..df38971725 100644 --- a/inventory/host_vars/openqa01.qa.fedoraproject.org +++ b/inventory/host_vars/openqa01.qa.fedoraproject.org @@ -22,7 +22,7 @@ datacenter: phx2 # virtual machine ############################################################ -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran lvm_size: 768000 mem_size: 4096 diff --git a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org index dcfe6acadc..94acd83231 100644 --- a/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-dev01.qa.fedoraproject.org @@ -24,7 +24,7 @@ datacenter: phx2 # virtual machine ############################################################ -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran lvm_size: 50000 mem_size: 4096 num_cpus: 4 diff --git a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org index 98c1f8e013..16d55320e3 100644 --- a/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb-stg01.qa.fedoraproject.org @@ -28,7 +28,7 @@ datacenter: phx2 # virtual machine ############################################################ -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran lvm_size: 50000 mem_size: 4096 diff --git a/inventory/host_vars/resultsdb01.qa.fedoraproject.org b/inventory/host_vars/resultsdb01.qa.fedoraproject.org index 54cebff577..b200e2d2db 100644 --- a/inventory/host_vars/resultsdb01.qa.fedoraproject.org +++ b/inventory/host_vars/resultsdb01.qa.fedoraproject.org @@ -28,7 +28,7 @@ vmhost: virthost-comm03.qa.fedoraproject.org # virtual machine ############################################################ -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran lvm_size: 50000 mem_size: 4096 num_cpus: 4 diff --git a/inventory/host_vars/s390-koji01.qa.fedoraproject.org b/inventory/host_vars/s390-koji01.qa.fedoraproject.org index c04d050c03..29591e0b51 100644 --- a/inventory/host_vars/s390-koji01.qa.fedoraproject.org +++ b/inventory/host_vars/s390-koji01.qa.fedoraproject.org @@ -12,7 +12,7 @@ datacenter: phx2 nrpe_procs_warn: 900 nrpe_procs_crit: 1000 -fas_client_groups: sysadmin-noc,sysadmin-secondary +fas_client_groups: sysadmin-noc,sysadmin-secondary,sysadmin-veteran fedmsg_fqdn: s390-koji01.qa.fedoraproject.org diff --git a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org index 738115a456..e74e8ac6a1 100644 --- a/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org +++ b/inventory/host_vars/taskotron-dev01.qa.fedoraproject.org @@ -18,7 +18,7 @@ volgroup: /dev/vg_guests vmhost: virthost-comm04.qa.fedoraproject.org datacenter: phx2 -fas_client_groups: sysadmin-qa,sysadmin-main,fi-apprentice +fas_client_groups: sysadmin-qa,sysadmin-main,sysadmin-noc,fi-apprentice,sysadmin-veteran ############################################################ # virtual machine