From 0953ea5efa84801b01fc7b1b2c8da459740818ea Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 8 Jan 2014 19:28:00 +0000 Subject: [PATCH] Move accelerate: true to global vars. --- playbooks/groups/backup-server.yml | 1 - playbooks/groups/badges-backend.yml | 3 --- playbooks/groups/badges-web.yml | 2 -- playbooks/groups/buildhw.yml | 2 -- playbooks/groups/buildvm.yml | 2 -- playbooks/groups/elections.yml | 2 -- playbooks/groups/fedocal.yml | 4 ---- playbooks/groups/gallery.yml | 3 --- playbooks/groups/jenkins-cloud.yml | 2 +- playbooks/groups/keyserver.yml | 2 -- playbooks/groups/mailman.yml | 3 --- playbooks/groups/mirrorlist.yml | 2 -- playbooks/groups/notifs-backend.yml | 3 --- playbooks/groups/notifs-web.yml | 2 -- playbooks/groups/nuancier.yml | 4 ---- playbooks/groups/releng.yml | 2 -- playbooks/groups/virthost.yml | 1 - vars/global.yml | 2 ++ 18 files changed, 3 insertions(+), 39 deletions(-) diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 8d9b30ee72..55e71ea7d0 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index db6c80fafe..d63959b17d 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: badges-backend;badges-backend-stg user: root gather_facts: True - accelerate: True roles: - /srv/web/infra/ansible/roles/fedmsg-hub diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 737dcbbb74..6a4805a552 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml index 0dc109d973..29f419e493 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -6,7 +6,6 @@ hosts: buildhw;buildppc;buildarm user: root gather_facts: True - accellerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -31,7 +30,6 @@ hosts: buildhw user: root gather_facts: True - accellerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index aa3191e0d5..99a630661e 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -7,7 +7,6 @@ hosts: buildvm user: root gather_facts: False - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: buildvm user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 5cf4819fb6..46d5b1226b 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/fedocal.yml b/playbooks/groups/fedocal.yml index 91ffcf861e..7b955d345f 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -56,7 +54,6 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -73,7 +70,6 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index d41f03c520..c08aa6c6a8 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -7,7 +7,6 @@ hosts: gallery-stg user: root gather_facts: False - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: gallery-stg user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,7 +52,6 @@ hosts: gallery-stg user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/jenkins-cloud.yml b/playbooks/groups/jenkins-cloud.yml index 2a70881f03..e07fd649b7 100644 --- a/playbooks/groups/jenkins-cloud.yml +++ b/playbooks/groups/jenkins-cloud.yml @@ -1,5 +1,5 @@ - name: check/create instance for jenkins-master - hosts: jenkins-cloud # 209.132.184.153 + hosts: 209.132.184.153 # jenkins.cloud.fedoraproject.org user: root gather_facts: False tags: diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index ec57825d4b..52665a8068 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -7,7 +7,6 @@ hosts: keys01.fedoraproject.org user: root gather_facts: False - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: keys01.fedoraproject.org user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 74582c2d93..e8a53d6ad6 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -6,7 +6,6 @@ hosts: mailman-stg user: root gather_facts: False - accelerate: True 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 user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/mirrorlist.yml b/playbooks/groups/mirrorlist.yml index c389d92f20..6d7f406a65 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -7,7 +7,6 @@ hosts: mirrorlist user: root gather_facts: False - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -24,7 +23,6 @@ hosts: mirrorlist user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 4d2dac3e2d..7ff35b5881 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -55,7 +53,6 @@ hosts: notifs-backend;notifs-backend-stg user: root gather_facts: True - accelerate: True roles: - /srv/web/infra/ansible/roles/fedmsg-hub diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 01458e3038..5a44457706 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 5a86f0673b..b589e5b2bd 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: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -56,7 +54,6 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -73,7 +70,6 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/releng.yml b/playbooks/groups/releng.yml index 9773c70560..926e5375a0 100644 --- a/playbooks/groups/releng.yml +++ b/playbooks/groups/releng.yml @@ -7,7 +7,6 @@ hosts: releng01.phx2.fedoraproject.org:releng02.phx2.fedoraproject.org user: root gather_facts: False - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -26,7 +25,6 @@ hosts: releng01.phx2.fedoraproject.org:releng02.phx2.fedoraproject.org user: root gather_facts: True - accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml index 08c2b71411..19aa16565f 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 user: root - accelerate: True gather_facts: True vars_files: diff --git a/vars/global.yml b/vars/global.yml index 210bf5dcbc..23ac99d60d 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -35,3 +35,5 @@ global_pkgs_inst: ['bind-utils', 'joe', '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 +# We want ansible accel mode by default +accelerate: true