diff --git a/files/iptables/iptables b/files/iptables/iptables index 78b74c8096..43e2190f01 100644 --- a/files/iptables/iptables +++ b/files/iptables/iptables @@ -17,12 +17,6 @@ # allow ssh - always -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT -# for fireball mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 192.168.1.58 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 209.132.181.6 -j ACCEPT - # for nrpe - allow it from nocs -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip diff --git a/files/iptables/iptables.staging b/files/iptables/iptables.staging index 8ead9b6d8c..36c3c9a525 100644 --- a/files/iptables/iptables.staging +++ b/files/iptables/iptables.staging @@ -29,12 +29,6 @@ COMMIT # allow ssh - always -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT -# for fireball mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 192.168.1.58 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 209.132.181.6 -j ACCEPT - # for nrpe - allow it from nocs -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 13192f6aa7..9ebd9e4ff7 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -7,7 +7,6 @@ hosts: anitya user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: anitya user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: anitya-frontend user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -86,7 +83,6 @@ hosts: anitya-backend user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index caef695bb5..6231eb3165 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -2,7 +2,6 @@ hosts: ask-stg:ask user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: ask-stg:ask user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index e12949d82c..adea79118b 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -7,7 +7,6 @@ hosts: autosign user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: autosign user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index eb80d3dfb0..dc9fc568e6 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -7,7 +7,6 @@ hosts: backup03.phx2.fedoraproject.org user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 2b0804128c..7fef846372 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: badges-backend;badges-backend-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -56,7 +54,6 @@ hosts: badges-backend;badges-backend-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - fedmsg/hub diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 9a3c684e30..0e202752c9 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: badges-web;badges-web-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 06a237bc1f..63ddaedc2b 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -2,7 +2,6 @@ hosts: bastion user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -19,7 +18,6 @@ hosts: bastion user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/bodhi.yml b/playbooks/groups/bodhi.yml index d0d873609b..baf1e63351 100644 --- a/playbooks/groups/bodhi.yml +++ b/playbooks/groups/bodhi.yml @@ -18,7 +18,6 @@ hosts: bodhi:bodhi-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index dc15ba78f9..421b888632 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -23,7 +23,6 @@ hosts: bugzilla2fedmsg;bugzilla2fedmsg-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -52,7 +51,6 @@ hosts: bugzilla2fedmsg;bugzilla2fedmsg-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - bugzilla2fedmsg diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index b9b1c228f3..3bc695fc79 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -7,7 +7,6 @@ hosts: buildvm:buildvm-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: buildvm:buildvm-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index a397a802bb..f72b928a47 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -10,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -19,7 +18,6 @@ hosts: busgateway;busgateway-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -51,7 +49,6 @@ hosts: busgateway;busgateway-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - role: fedmsg/hub diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml index ad9aa51083..2cc57036ff 100644 --- a/playbooks/groups/composers.yml +++ b/playbooks/groups/composers.yml @@ -7,7 +7,6 @@ hosts: composers;composers-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -26,7 +25,6 @@ hosts: composers;composers-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -66,7 +64,6 @@ hosts: composers-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -89,7 +86,6 @@ hosts: composers-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - atomic-composer diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index a1388b3927..72f47600ff 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -12,7 +12,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -21,7 +20,6 @@ hosts: datagrepper;datagrepper-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -56,7 +54,6 @@ hosts: datagrepper;datagrepper-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -80,7 +77,6 @@ # hosts: datagrepper;datagrepper-stg # user: root # gather_facts: True -# accelerate: "{{ accelerated }}" # # vars_files: # - /srv/web/infra/ansible/vars/global.yml @@ -103,7 +99,6 @@ # hosts: datagrepper;datagrepper-stg # user: root # gather_facts: True -# accelerate: "{{ accelerated }}" # # vars_files: # - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 6b2a3ccde4..169bc7bd35 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -2,7 +2,6 @@ hosts: dhcp user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: dhcp user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index df97d45d77..b1668f95bb 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -2,7 +2,6 @@ hosts: docs-backend user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -19,7 +18,6 @@ hosts: docs-backend user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: docs-backend user: root gather_facts: True - accelerate: False vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index 8dbe34c273..694c725707 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -3,7 +3,6 @@ user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -21,7 +20,6 @@ hosts: download user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -29,7 +27,6 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -39,7 +36,6 @@ hosts: download user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 22f7402c45..af3e5e2b5a 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -10,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -19,7 +18,6 @@ hosts: elections;elections-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -52,7 +50,6 @@ hosts: elections;elections-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -69,7 +66,6 @@ hosts: elections;elections-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 03e7079627..a9156e36ae 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -10,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -19,7 +18,6 @@ hosts: fedimg;fedimg-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -49,7 +47,6 @@ hosts: fedimg;fedimg-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - fedmsg/hub diff --git a/playbooks/groups/fedoauth.yml b/playbooks/groups/fedoauth.yml index 503fada7e3..ff964f01fa 100644 --- a/playbooks/groups/fedoauth.yml +++ b/playbooks/groups/fedoauth.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: fedoauth-stg:fedoauth user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: fedoauth-stg:fedoauth user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 7978defa6e..b27843f4eb 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -74,7 +71,6 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index ef70dbee78..17972eb0d0 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -7,7 +7,6 @@ hosts: gallery-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: gallery-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: gallery-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index d78fe7960d..6ed0bb304a 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: github2fedmsg;github2fedmsg-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -58,7 +56,6 @@ hosts: github2fedmsg;github2fedmsg-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index b17d1035bb..6e13c454d9 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: kerneltest-stg:kerneltest user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: kerneltest-stg:kerneltest user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index bc30c3a194..3afa028b54 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -7,7 +7,6 @@ hosts: keys user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: keys user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 2dc3a40ec5..f537a17ea7 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -6,7 +6,6 @@ hosts: mailman-stg:mailman user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -15,7 +14,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +22,6 @@ hosts: mailman-stg:mailman user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 55771c3d71..5fc955bb4b 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -2,7 +2,6 @@ hosts: memcached user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: memcached user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index cb5adab802..4f41245ece 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -7,7 +7,6 @@ hosts: mirrorlist user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: mirrorlist user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 07d5401d27..5cb202e5fc 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -10,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -19,7 +18,6 @@ hosts: nagios user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -53,7 +51,6 @@ hosts: nagios user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 984cd7274f..89dc3a4ed2 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: notifs-backend;notifs-backend-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -58,7 +56,6 @@ hosts: notifs-backend;notifs-backend-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - fedmsg/hub diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index b181ff5f40..ff105dded6 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: notifs-web;notifs-web-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index baccf5e12b..c066498180 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -74,7 +71,6 @@ hosts: nuancier-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -105,7 +101,6 @@ hosts: nuancier user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -136,7 +131,6 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 6fc9d468b7..0303d9a4d3 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: packages;packages-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -58,7 +56,6 @@ hosts: packages user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -81,7 +78,6 @@ hosts: packages user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -107,7 +103,6 @@ hosts: packages;packages-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index b8c55995b5..282979372c 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -2,7 +2,6 @@ hosts: paste-stg:paste user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: paste-stg:paste user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 2b6b3ae2a9..3c60e4e6fe 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: pkgdb-stg;pkgdb user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: pkgdb-stg;pkgdb user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -74,7 +71,6 @@ hosts: pkgdb-stg;pkgdb user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index 8e34b6ac4f..49511c028d 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -18,7 +18,6 @@ hosts: pkgs-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -58,7 +57,6 @@ hosts: pkgs-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 543a7d486f..fd8f73c920 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -6,7 +6,6 @@ hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -25,7 +24,6 @@ hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/qadevel-stg.yml b/playbooks/groups/qadevel-stg.yml index f20beca3ca..88b50efb19 100644 --- a/playbooks/groups/qadevel-stg.yml +++ b/playbooks/groups/qadevel-stg.yml @@ -7,7 +7,6 @@ hosts: qadevel-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: qadevel-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: qadevel-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml index 74025dafac..277939a737 100644 --- a/playbooks/groups/qadevel.yml +++ b/playbooks/groups/qadevel.yml @@ -7,7 +7,6 @@ hosts: qadevel user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: qadevel user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: qadevel user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -73,7 +70,6 @@ hosts: qadevel user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 3d3f9823de..f1ff6973f4 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -7,7 +7,6 @@ hosts: resultsdb-dev user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: resultsdb-dev user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: resultsdb-dev user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 21cb090af5..7a39908347 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -7,7 +7,6 @@ hosts: resultsdb-prod user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: resultsdb-prod user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -56,7 +54,6 @@ hosts: resultsdb-prod user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 0f5031350f..8cf79e0fc0 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -7,7 +7,6 @@ hosts: resultsdb-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: resultsdb-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 1537ebde6a..300b83a962 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -20,7 +20,6 @@ hosts: smtp-mm user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index fd9a560812..90ed6e7a1a 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -15,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -24,7 +23,6 @@ hosts: summershum;summershum-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: summershum;summershum-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -74,7 +71,6 @@ hosts: summershum;summershum-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" roles: - fedmsg/hub diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 7f3dd4fad6..a810d214df 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -7,7 +7,6 @@ hosts: sundries;sundries-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: sundries;sundries-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index db6b3257b2..9506836685 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -7,7 +7,6 @@ hosts: tagger;tagger-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -16,7 +15,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -25,7 +23,6 @@ hosts: tagger;tagger-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -59,7 +56,6 @@ hosts: tagger;tagger-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -77,7 +73,6 @@ hosts: tagger;tagger-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/taskotron-dev-clients.yml b/playbooks/groups/taskotron-dev-clients.yml index eca9f16f52..c514f7ba17 100644 --- a/playbooks/groups/taskotron-dev-clients.yml +++ b/playbooks/groups/taskotron-dev-clients.yml @@ -7,7 +7,6 @@ hosts: taskotron-dev-clients user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: taskotron-dev-clients user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: taskotron-dev-clients user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index 57e1b59c93..73be6fe740 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -7,7 +7,6 @@ hosts: taskotron-dev user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: taskotron-dev user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: taskotron-dev user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/taskotron-prod-clients.yml b/playbooks/groups/taskotron-prod-clients.yml index 4c2d4993d4..184ab10cce 100644 --- a/playbooks/groups/taskotron-prod-clients.yml +++ b/playbooks/groups/taskotron-prod-clients.yml @@ -7,7 +7,6 @@ hosts: taskotron-prod-clients user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: taskotron-prod-clients user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: taskotron-prod-clients user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml index 0e9f4a553f..767993d8ec 100644 --- a/playbooks/groups/taskotron-prod.yml +++ b/playbooks/groups/taskotron-prod.yml @@ -7,7 +7,6 @@ hosts: taskotron-prod user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: taskotron-prod user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -57,7 +55,6 @@ hosts: taskotron-prod user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/taskotron-stg-clients.yml b/playbooks/groups/taskotron-stg-clients.yml index 579e7a87f0..9526bd2f92 100644 --- a/playbooks/groups/taskotron-stg-clients.yml +++ b/playbooks/groups/taskotron-stg-clients.yml @@ -7,7 +7,6 @@ hosts: taskotron-stg-clients user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: taskotron-stg-clients user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: taskotron-stg-clients user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml index 0ecca7adcc..a4960f13a3 100644 --- a/playbooks/groups/taskotron-stg.yml +++ b/playbooks/groups/taskotron-stg.yml @@ -7,7 +7,6 @@ hosts: taskotron-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: taskotron-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: taskotron-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index 46ca19f334..e211b62e47 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -2,7 +2,6 @@ hosts: unbound user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: unbound user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 87932d2574..05ca9419a0 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -2,7 +2,6 @@ hosts: value:value-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: value:value-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 92e66900d7..e38555a8fc 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -5,7 +5,6 @@ - name: make virthost server system hosts: virthost15.phx2.fedoraproject.org:bvirthost07.phx2.fedoraproject.org:buildvmhost-10.phx2.fedoraproject.org:buildvmhost-11.phx2.fedoraproject.org:buildvmhost-12.phx2.fedoraproject.org:virthost01.phx2.fedoraproject.org:virthost03.phx2.fedoraproject.org:ibiblio04.fedoraproject.org:bvirthost06.phx2.fedoraproject.org:bvirthost08.phx2.fedoraproject.org:bvirthost09.phx2.fedoraproject.org:bvirthost10.phx2.fedoraproject.org:bvirthost11.phx2.fedoraproject.org:virthost16.phx2.fedoraproject.org:virthost17.phx2.fedoraproject.org:virthost18.phx2.fedoraproject.org:serverbeach07.fedoraproject.org:qa07.qa.fedoraproject.org:qa09.qa.fedoraproject.org:coloamer01.fedoraproject.org:qa04.qa.fedoraproject.org:qa05.qa.fedoraproject.org:osuosl03.fedoraproject.org:qa06.qa.fedoraproject.org:virthost-comm03.qa.fedoraproject.org:host1plus01.fedoraproject.org:virthost10.phx2.fedoraproject.org:virthost12.phx2.fedoraproject.org:virthost06.phx2.fedoraproject.org:virthost07.phx2.fedoraproject.org:virthost08.phx2.fedoraproject.org:virthost09.phx2.fedoraproject.org:virthost14.phx2.fedoraproject.org user: root - accelerate: "{{ accelerated }}" gather_facts: True vars_files: diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 3cd42dc0a1..1bed373ff6 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -7,7 +7,6 @@ hosts: wiki:wiki-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: wiki:wiki-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/host_update.yml b/playbooks/host_update.yml index fdb13c5f56..2da686dc0e 100644 --- a/playbooks/host_update.yml +++ b/playbooks/host_update.yml @@ -5,7 +5,6 @@ - name: update the system hosts: "{{ target }}" - accelerate: "{{ accelerated }}" gather_facts: false user: root @@ -20,7 +19,6 @@ - name: run rkhunter if installed hosts: "{{ target }}" - accelerate: "{{ accelerated }}" user: root tasks: diff --git a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml index 2b2a318604..2624deffd4 100644 --- a/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml +++ b/playbooks/hosts/cloud-noc01.cloud.fedoraproject.org.yml @@ -3,7 +3,6 @@ - name: make cloud noc hardware hosts: cloud-noc01.cloud.fedoraproject.org user: root - accelerate: "{{ accelerated }}" gather_facts: True vars_files: diff --git a/playbooks/hosts/junk02.phx2.fedoraproject.org.yml b/playbooks/hosts/junk02.phx2.fedoraproject.org.yml index 5f492ef12a..f9c24d297b 100644 --- a/playbooks/hosts/junk02.phx2.fedoraproject.org.yml +++ b/playbooks/hosts/junk02.phx2.fedoraproject.org.yml @@ -3,7 +3,6 @@ - name: make basic box hosts: junk02.phx2.fedoraproject.org user: root - accelerate: "{{ accelerated }}" gather_facts: True vars_files: diff --git a/playbooks/hosts/logserver.yml b/playbooks/hosts/logserver.yml index ce7d2fef28..009e1e90b8 100644 --- a/playbooks/hosts/logserver.yml +++ b/playbooks/hosts/logserver.yml @@ -2,7 +2,6 @@ hosts: log01.phx2.fedoraproject.org user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -11,7 +10,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -20,7 +18,6 @@ hosts: log01.phx2.fedoraproject.org user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/liberate-5099.yml b/playbooks/manual/liberate-5099.yml deleted file mode 100644 index 6d0dc791c6..0000000000 --- a/playbooks/manual/liberate-5099.yml +++ /dev/null @@ -1,14 +0,0 @@ -# requires --extra-vars="target='host1;host2;group etc' - -- name: Find whatever is running on port 5099 and storm its figurative bastille. - hosts: "{{ target }}" - user: root - - tasks: - - name: find the PID of whatever is on port 5099 - command: lsof -i :5099 -t - register: offenders - - - name: salt the earth - command: "kill {{ item }}" - with_items: "{{ offenders.stdout_lines }}" diff --git a/playbooks/manual/push-badges.yml b/playbooks/manual/push-badges.yml index 1881d8dfba..bd10092a72 100644 --- a/playbooks/manual/push-badges.yml +++ b/playbooks/manual/push-badges.yml @@ -11,7 +11,6 @@ hosts: lockbox01.phx2.fedoraproject.org user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -42,7 +41,6 @@ hosts: badges-web;badges-web-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -56,7 +54,6 @@ hosts: badges-backend;badges-backend-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/qadevel.yml b/playbooks/manual/qadevel.yml index cdf14e71e2..d5d28b1f7e 100644 --- a/playbooks/manual/qadevel.yml +++ b/playbooks/manual/qadevel.yml @@ -7,7 +7,6 @@ hosts: qadevel;qadevel-stg user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: qadevel;qadevel-stg user: root gather_facts: True - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/manual/sign-bridge.yml b/playbooks/manual/sign-bridge.yml index 5b055c20e4..9fad92bf6d 100644 --- a/playbooks/manual/sign-bridge.yml +++ b/playbooks/manual/sign-bridge.yml @@ -10,7 +10,6 @@ hosts: sign-bridge user: root gather_facts: False - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -19,7 +18,6 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" - - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" diff --git a/playbooks/manual/upgrade/fmn.yml b/playbooks/manual/upgrade/fmn.yml index 718958fbba..d82c1f7c5b 100644 --- a/playbooks/manual/upgrade/fmn.yml +++ b/playbooks/manual/upgrade/fmn.yml @@ -2,7 +2,6 @@ - name: push packages out hosts: notifs-backend;notifs-backend-stg;notifs-web;notifs-web-stg user: root - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" @@ -24,7 +23,6 @@ - name: verify the frontend and stop it hosts: notifs-web;notifs-web-stg user: root - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" @@ -39,7 +37,6 @@ - name: verify the backend, stop it, and then upgrade the db hosts: notifs-backend;notifs-backend-stg user: root - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" @@ -61,7 +58,6 @@ - name: restart the frontend hosts: notifs-web;notifs-web-stg user: root - accelerate: "{{ accelerated }}" vars_files: - /srv/web/infra/ansible/vars/global.yml - "{{ private }}/vars.yml" diff --git a/playbooks/restart_unbound.yml b/playbooks/restart_unbound.yml index 55b36a180d..6c28bf57f4 100644 --- a/playbooks/restart_unbound.yml +++ b/playbooks/restart_unbound.yml @@ -5,7 +5,6 @@ - name: find instances hosts: "{{ target }}" - accelerate: "{{ accelerated }}" gather_facts: False user: root diff --git a/playbooks/vhost_reboot.yml b/playbooks/vhost_reboot.yml index 11e06968a6..427511d8de 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -104,7 +104,6 @@ - name: Fix unbound if necessary # intersection - hosts that are in our dynamic group and also in unbound-dns hosts: "myvms_new:&unbound" - accelerate: "{{ accelerated }}" user: root vars_files: diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index b430e26d35..b4a7d95796 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -5,7 +5,6 @@ - name: find instances hosts: "{{ target }}" - accelerate: "{{ accelerated }}" gather_facts: False user: root @@ -20,7 +19,6 @@ - name: update the system hosts: "{{ target }}:myvms_new" - accelerate: "{{ accelerated }}" gather_facts: False user: root @@ -35,7 +33,6 @@ - name: run rkhunter if installed hosts: "{{ target }}:myvms_new" - accelerate: "{{ accelerated }}" user: root tasks: diff --git a/roles/base/templates/iptables/iptables b/roles/base/templates/iptables/iptables index 3d31a918e1..c93e56d318 100644 --- a/roles/base/templates/iptables/iptables +++ b/roles/base/templates/iptables/iptables @@ -17,12 +17,6 @@ # allow ssh - always -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT -# for fireball mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 192.168.1.58 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 209.132.181.6 -j ACCEPT - # for nrpe - allow it from nocs -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip diff --git a/roles/base/templates/iptables/iptables.kojibuilder b/roles/base/templates/iptables/iptables.kojibuilder index e7a56c22a9..eb158017f4 100644 --- a/roles/base/templates/iptables/iptables.kojibuilder +++ b/roles/base/templates/iptables/iptables.kojibuilder @@ -53,12 +53,6 @@ -A INPUT -p tcp -m tcp -s 10.5.0.0/16 --dport 22 -j ACCEPT -A OUTPUT -p tcp -m tcp -d 10.5.0.0/16 --sport 22 -j ACCEPT -# for ansible accelerate mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 192.168.1.58 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 209.132.181.6 -j ACCEPT - # git to pkgs -A OUTPUT -m tcp -p tcp --dport 9418 -d 10.5.125.44 -j ACCEPT -A OUTPUT -m udp -p udp --dport 9418 -d 10.5.125.44 -j ACCEPT diff --git a/roles/base/templates/iptables/iptables.osuosl b/roles/base/templates/iptables/iptables.osuosl index 51a336b914..ad82724e5b 100644 --- a/roles/base/templates/iptables/iptables.osuosl +++ b/roles/base/templates/iptables/iptables.osuosl @@ -22,12 +22,6 @@ # external ip for scrye -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -s 75.148.32.185 -j ACCEPT -# for fireball mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 192.168.1.58 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 209.132.181.6 -j ACCEPT - # for nrpe - allow it from nocs -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip diff --git a/roles/base/templates/iptables/iptables.releng b/roles/base/templates/iptables/iptables.releng index b835d15c56..7048429360 100644 --- a/roles/base/templates/iptables/iptables.releng +++ b/roles/base/templates/iptables/iptables.releng @@ -42,10 +42,6 @@ COMMIT -A INPUT -p tcp -m tcp -s 192.168.100.0/24 --dport 22 -j REJECT --reject-with tcp-reset -A INPUT -p tcp -m tcp --dport 22 -j ACCEPT -# for fireball mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT - # Allow all netapp traffic -A INPUT -p udp -m udp -s 10.5.88.36 -j ACCEPT -A INPUT -p tcp -m tcp -s 10.5.88.36 -j ACCEPT diff --git a/roles/base/templates/iptables/iptables.staging b/roles/base/templates/iptables/iptables.staging index 8ead9b6d8c..36c3c9a525 100644 --- a/roles/base/templates/iptables/iptables.staging +++ b/roles/base/templates/iptables/iptables.staging @@ -29,12 +29,6 @@ COMMIT # allow ssh - always -A INPUT -m conntrack --ctstate NEW -m tcp -p tcp --dport 22 -j ACCEPT -# for fireball mode - allow port 5099 from lockbox and it's ips --A INPUT -p tcp -m tcp --dport 5099 -s 192.168.1.58 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.126.23 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 10.5.127.51 -j ACCEPT --A INPUT -p tcp -m tcp --dport 5099 -s 209.132.181.6 -j ACCEPT - # for nrpe - allow it from nocs -A INPUT -p tcp -m tcp --dport 5666 -s 192.168.1.10 -j ACCEPT # FIXME - this is the global nat-ip and we need the noc01-specific ip diff --git a/tasks/accelerate_prep.yml b/tasks/accelerate_prep.yml deleted file mode 100644 index f3d73a1e8e..0000000000 --- a/tasks/accelerate_prep.yml +++ /dev/null @@ -1,7 +0,0 @@ ---- -- name: install needed packages for accelerated mode - yum: pkg={{ item }} state=present - with_items: - - python-keyczar - tags: - - packages diff --git a/vars/global.yml b/vars/global.yml index 91b4429044..556b7eea39 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -37,7 +37,5 @@ global_pkgs_inst: ['bind-utils', 'mailx', 'nc', 'openssh-clients', netapp_iscsi_name: iqn.1992-08.com.netapp:sn.1573980081:vf.6fb258f4-106f-11e2-ae29-00a098161d90 # iscsi portal for netapp iscsi volume netapp_iscsi_portal: 10.5.88.35 -# By default no acclerated, override on playbook command line. -accelerated: False # sudo: False by default so ansible doesn't try and check for it and hang sudo: False