diff options
author | Kevin Fenzi <kevin@scrye.com> | 2014-01-08 19:28:00 +0000 |
---|---|---|
committer | Kevin Fenzi <kevin@scrye.com> | 2014-01-08 19:28:00 +0000 |
commit | 0953ea5efa84801b01fc7b1b2c8da459740818ea (patch) | |
tree | 7086da2e7554b41c7e7996fca6c5622f852a405b | |
parent | 136866729f902ced3fcd10c0a9b6b7aacf0d76cf (diff) | |
download | ansible-0953ea5efa84801b01fc7b1b2c8da459740818ea.tar.gz ansible-0953ea5efa84801b01fc7b1b2c8da459740818ea.tar.xz ansible-0953ea5efa84801b01fc7b1b2c8da459740818ea.zip |
Move accelerate: true to global vars.
-rw-r--r-- | playbooks/groups/backup-server.yml | 1 | ||||
-rw-r--r-- | playbooks/groups/badges-backend.yml | 3 | ||||
-rw-r--r-- | playbooks/groups/badges-web.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/buildhw.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/buildvm.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/elections.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/fedocal.yml | 4 | ||||
-rw-r--r-- | playbooks/groups/gallery.yml | 3 | ||||
-rw-r--r-- | playbooks/groups/jenkins-cloud.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/keyserver.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/mailman.yml | 3 | ||||
-rw-r--r-- | playbooks/groups/mirrorlist.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/notifs-backend.yml | 3 | ||||
-rw-r--r-- | playbooks/groups/notifs-web.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/nuancier.yml | 4 | ||||
-rw-r--r-- | playbooks/groups/releng.yml | 2 | ||||
-rw-r--r-- | playbooks/groups/virthost.yml | 1 | ||||
-rw-r--r-- | 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 8d9b30ee7..55e71ea7d 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 db6c80faf..d63959b17 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 737dcbbb7..6a4805a55 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 0dc109d97..29f419e49 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 aa3191e0d..99a630661 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 5cf4819fb..46d5b1226 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 91ffcf861..7b955d345 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 d41f03c52..c08aa6c6a 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 2a70881f0..e07fd649b 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 ec57825d4..52665a806 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 74582c2d9..e8a53d6ad 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 c389d92f2..6d7f406a6 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 4d2dac3e2..7ff35b588 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 01458e303..5a4445770 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 5a86f0673..b589e5b2b 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 9773c7056..926e5375a 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 08c2b7141..19aa16565 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 210bf5dcb..23ac99d60 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 |