From b9ff6d133d339f62b6a1e081844ea07734f7001d Mon Sep 17 00:00:00 2001 From: Kevin Fenzi Date: Wed, 8 Jan 2014 20:35:05 +0000 Subject: [PATCH] Revert "Move accelerate: true to global vars." This reverts commit 0953ea5efa84801b01fc7b1b2c8da459740818ea. Looks like this doesn't work as a var, and accel might just get dropped in favor of new ssh soon. --- 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, 39 insertions(+), 3 deletions(-) diff --git a/playbooks/groups/backup-server.yml b/playbooks/groups/backup-server.yml index 55e71ea7d0..8d9b30ee72 100644 --- a/playbooks/groups/backup-server.yml +++ b/playbooks/groups/backup-server.yml @@ -7,6 +7,7 @@ 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 d63959b17d..db6c80fafe 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -15,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -23,6 +24,7 @@ hosts: badges-backend;badges-backend-stg user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -53,6 +55,7 @@ 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 6a4805a552..737dcbbb74 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -15,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -23,6 +24,7 @@ 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 29f419e493..0dc109d973 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -6,6 +6,7 @@ hosts: buildhw;buildppc;buildarm user: root gather_facts: True + accellerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -30,6 +31,7 @@ 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 99a630661e..aa3191e0d5 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -7,6 +7,7 @@ hosts: buildvm user: root gather_facts: False + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -23,6 +24,7 @@ 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 46d5b1226b..5cf4819fb6 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -10,6 +10,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -18,6 +19,7 @@ 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 7b955d345f..91ffcf861e 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -15,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -23,6 +24,7 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,6 +56,7 @@ hosts: fedocal-stg;fedocal user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -70,6 +73,7 @@ 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 c08aa6c6a8..d41f03c520 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -7,6 +7,7 @@ hosts: gallery-stg user: root gather_facts: False + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -23,6 +24,7 @@ hosts: gallery-stg user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -52,6 +54,7 @@ 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 e07fd649b7..2a70881f03 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: 209.132.184.153 # jenkins.cloud.fedoraproject.org + hosts: jenkins-cloud # 209.132.184.153 user: root gather_facts: False tags: diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 52665a8068..ec57825d4b 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -7,6 +7,7 @@ hosts: keys01.fedoraproject.org user: root gather_facts: False + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -23,6 +24,7 @@ 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 e8a53d6ad6..74582c2d93 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -6,6 +6,7 @@ hosts: mailman-stg user: root gather_facts: False + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -14,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -22,6 +24,7 @@ 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 6d7f406a65..c389d92f20 100644 --- a/playbooks/groups/mirrorlist.yml +++ b/playbooks/groups/mirrorlist.yml @@ -7,6 +7,7 @@ hosts: mirrorlist user: root gather_facts: False + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -23,6 +24,7 @@ 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 7ff35b5881..4d2dac3e2d 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -15,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -23,6 +24,7 @@ hosts: notifs-backend;notifs-backend-stg user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -53,6 +55,7 @@ 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 5a44457706..01458e3038 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -15,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -23,6 +24,7 @@ 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 b589e5b2bd..5a86f0673b 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -15,6 +15,7 @@ tasks: - include: "{{ tasks }}/virt_instance_create.yml" + - include: "{{ tasks }}/accelerate_prep.yml" handlers: - include: "{{ handlers }}/restart_services.yml" @@ -23,6 +24,7 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -54,6 +56,7 @@ hosts: nuancier;nuancier-stg user: root gather_facts: True + accelerate: True vars_files: - /srv/web/infra/ansible/vars/global.yml @@ -70,6 +73,7 @@ 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 926e5375a0..9773c70560 100644 --- a/playbooks/groups/releng.yml +++ b/playbooks/groups/releng.yml @@ -7,6 +7,7 @@ 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 @@ -25,6 +26,7 @@ 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 19aa16565f..08c2b71411 100644 --- a/playbooks/groups/virthost.yml +++ b/playbooks/groups/virthost.yml @@ -5,6 +5,7 @@ - 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 23ac99d60d..210bf5dcbc 100644 --- a/vars/global.yml +++ b/vars/global.yml @@ -35,5 +35,3 @@ 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