diff --git a/inventory/group_vars/ask b/inventory/group_vars/ask index f9732c40db..de54c8d9fb 100644 --- a/inventory/group_vars/ask +++ b/inventory/group_vars/ask @@ -8,6 +8,9 @@ tcp_ports: [ 80, 443, # These 8 ports are used by fedmsg. One for each wsgi thread. 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/ask-stg b/inventory/group_vars/ask-stg index f9732c40db..de54c8d9fb 100644 --- a/inventory/group_vars/ask-stg +++ b/inventory/group_vars/ask-stg @@ -8,6 +8,9 @@ tcp_ports: [ 80, 443, # These 8 ports are used by fedmsg. One for each wsgi thread. 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-ask,fi-apprentice # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/badges-web b/inventory/group_vars/badges-web index f72d2176e9..e9d1b847f1 100644 --- a/inventory/group_vars/badges-web +++ b/inventory/group_vars/badges-web @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-badges # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/badges-web-stg b/inventory/group_vars/badges-web-stg index 62566a286a..224a6ee089 100644 --- a/inventory/group_vars/badges-web-stg +++ b/inventory/group_vars/badges-web-stg @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-badges # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/bodhi b/inventory/group_vars/bodhi index b7b745f9bb..8d8c0bef57 100644 --- a/inventory/group_vars/bodhi +++ b/inventory/group_vars/bodhi @@ -15,6 +15,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/bodhi-stg b/inventory/group_vars/bodhi-stg index b7b745f9bb..8d8c0bef57 100644 --- a/inventory/group_vars/bodhi-stg +++ b/inventory/group_vars/bodhi-stg @@ -15,6 +15,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/elections b/inventory/group_vars/elections index 3441727320..d692e1b9ed 100644 --- a/inventory/group_vars/elections +++ b/inventory/group_vars/elections @@ -6,4 +6,7 @@ num_cpus: 2 tcp_ports: [ 443 ] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice diff --git a/inventory/group_vars/elections-stg b/inventory/group_vars/elections-stg index 1269742884..514b6655e0 100644 --- a/inventory/group_vars/elections-stg +++ b/inventory/group_vars/elections-stg @@ -6,4 +6,7 @@ num_cpus: 2 tcp_ports: [ 443 ] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-web,fi-apprentice diff --git a/inventory/group_vars/fedoauth b/inventory/group_vars/fedoauth index 42ab8539a8..ac6d9dad1c 100644 --- a/inventory/group_vars/fedoauth +++ b/inventory/group_vars/fedoauth @@ -9,4 +9,7 @@ num_cpus: 2 tcp_ports: [ 80, 443 ] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-main,sysadmin-accounts diff --git a/inventory/group_vars/fedoauth-stg b/inventory/group_vars/fedoauth-stg index 42ab8539a8..ac6d9dad1c 100644 --- a/inventory/group_vars/fedoauth-stg +++ b/inventory/group_vars/fedoauth-stg @@ -9,4 +9,7 @@ num_cpus: 2 tcp_ports: [ 80, 443 ] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-main,sysadmin-accounts diff --git a/inventory/group_vars/fedocal b/inventory/group_vars/fedocal index cedc7f0e96..d2fe2f40f0 100644 --- a/inventory/group_vars/fedocal +++ b/inventory/group_vars/fedocal @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-web # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/fedocal-stg b/inventory/group_vars/fedocal-stg index 91176e21f1..1b2ad118c1 100644 --- a/inventory/group_vars/fedocal-stg +++ b/inventory/group_vars/fedocal-stg @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-web # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/packages b/inventory/group_vars/packages index 124f8ea9db..b9d744d55e 100644 --- a/inventory/group_vars/packages +++ b/inventory/group_vars/packages @@ -14,6 +14,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-web # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/packages-stg b/inventory/group_vars/packages-stg index 5d5fe97544..2fc962abac 100644 --- a/inventory/group_vars/packages-stg +++ b/inventory/group_vars/packages-stg @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc,sysadmin-web # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/paste b/inventory/group_vars/paste index 2d17ea62bc..64ccef9663 100644 --- a/inventory/group_vars/paste +++ b/inventory/group_vars/paste @@ -8,6 +8,8 @@ num_cpus: 2 # the host_vars/$hostname file tcp_ports: [ 80, 443, 8888 ] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] fas_client_groups: sysadmin-noc,sysadmin-paste,fi-apprentice # This host doesn't freeze diff --git a/inventory/group_vars/tagger b/inventory/group_vars/tagger index 29425ea3ed..c930b04f7a 100644 --- a/inventory/group_vars/tagger +++ b/inventory/group_vars/tagger @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/inventory/group_vars/tagger-stg b/inventory/group_vars/tagger-stg index e8cd77d765..d0a10c1904 100644 --- a/inventory/group_vars/tagger-stg +++ b/inventory/group_vars/tagger-stg @@ -12,6 +12,9 @@ tcp_ports: [ 80, 443, 3000, 3001, 3002, 3003, 3004, 3005, 3006, 3007, 3008, 3009, 3010, 3011, 3012, 3013, 3014, 3015] +# Neeed for rsync from log02 for logs. +custom_rules: [ '-A INPUT -p tcp -m tcp -s 10.5.126.29 --dport 873 -j ACCEPT', '-A INPUT -p tcp -m tcp -s 192.168.1.56 --dport 873 -j ACCEPT' ] + fas_client_groups: sysadmin-noc # These are consumed by a task in roles/fedmsg/base/main.yml diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index f628a593c3..bba8ddd103 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -36,6 +36,7 @@ - collectd - ask - fedmsg/base + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 3cc32f3bed..c457917cd0 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -39,6 +39,7 @@ - fas_client - badges/frontend - fedmsg/base + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index bc25e4aa84..0f7136c63d 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -35,6 +35,7 @@ - { role: bodhi/masher, jobrunner: true, when: "inventory_hostname.startswith('releng04')" } - { role: bodhi/masher, epelmasher: true, when: "inventory_hostname.startswith('relepel01')" } - fedmsg/base + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 0e44193cab..1c874e7433 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -32,6 +32,7 @@ - denyhosts - nagios_client - fas_client + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/fedoauth.yml b/playbooks/groups/fedoauth.yml index 62c75bb0c1..4bec7c39c9 100644 --- a/playbooks/groups/fedoauth.yml +++ b/playbooks/groups/fedoauth.yml @@ -37,6 +37,7 @@ - denyhosts - nagios_client - fas_client + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 67f9725ce3..7de678d486 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -37,6 +37,7 @@ - denyhosts - nagios_client - fas_client + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 7bd87b96a5..1392c72d37 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -37,6 +37,7 @@ - denyhosts - nagios_client - fas_client + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml" diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index b12aa4f8a6..43b64d912f 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -37,6 +37,7 @@ - denyhosts - nagios_client - fas_client + - rsyncd tasks: - include: "{{ tasks }}/hosts.yml"