diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index c6612136e2..4e10dd7f67 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -1,23 +1,5 @@ # create a new sks keyserver -# NOTE: should be used with --limit most of the time -# NOTE: make sure there is room/space for this server on the vmhost -# NOTE: most of these vars_path come from group_vars/gallery-web* or from hostvars - -- name: make the servers - hosts: anitya - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=anitya" - name: make the boxen be real for real hosts: anitya diff --git a/playbooks/groups/ask.yml b/playbooks/groups/ask.yml index 6501d79085..0a4c0f49c2 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -1,18 +1,4 @@ -- name: make ask - hosts: ask-stg:ask - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ask-stg:ask" - name: make the box be real hosts: ask-stg:ask diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index 6ed73e9263..a77746a4b6 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -2,22 +2,7 @@ # # This server looks for rawhide builds and requests they be signed. # - -- name: make autosign server - hosts: autosign - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign" - name: make the box be real hosts: autosign diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 7605bb90d0..3c06544323 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make badges-backend server - hosts: badges-backend;badges-backend-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-backend:badges-backend-stg" - name: dole out the generic configuration hosts: badges-backend;badges-backend-stg diff --git a/playbooks/groups/badges-web.yml b/playbooks/groups/badges-web.yml index 7a7ab3dfef..c9f40526b7 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/badges-web* or from hostvars -- name: make badges-web server - hosts: badges-web;badges-web-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-web;badges-web-stg" - name: make the box be real hosts: badges-web;badges-web-stg diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 800829dbc8..3b854a1687 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -1,18 +1,4 @@ -- name: make the servers - hosts: bastion - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bastion" - name: make the boxen be real for real hosts: bastion diff --git a/playbooks/groups/beaker-stg.yml b/playbooks/groups/beaker-stg.yml index 287ff34f79..efa00d87a5 100644 --- a/playbooks/groups/beaker-stg.yml +++ b/playbooks/groups/beaker-stg.yml @@ -2,21 +2,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make beaker server - hosts: beaker-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker-stg" - name: make the box be real hosts: beaker-stg diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index 6c9b5e586f..d56f9161b2 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -2,21 +2,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make beaker server - hosts: beaker - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker" - name: make the box be real hosts: beaker diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 70d66fa818..dbfbadf6a7 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -1,18 +1,4 @@ -- name: make blockerbugs servers - hosts: blockerbugs:blockerbugs-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs:blockerbugs-stg" - name: make the box be real hosts: blockerbugs:blockerbugs-stg diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index 2968ef81c6..6e76ae6fb7 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -5,21 +5,7 @@ # They also run some misc releng scripts. # -- name: make bodhi-backend systems - hosts: bodhi-backend:bodhi-backend-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi-backend:bodhi-backend-stg" # Once the instance exists, configure it. diff --git a/playbooks/groups/bodhi2.yml b/playbooks/groups/bodhi2.yml index 991b8a17d7..5604c70b3b 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -1,18 +1,4 @@ -- name: make bodhi2 - hosts: bodhi2:bodhi2-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi2:bodhi2-stg" - name: make the box be real hosts: bodhi2:bodhi2-stg diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 4908ed61f2..84f3ce75a7 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make bugzilla2fedmsg server - hosts: bugzilla2fedmsg;bugzilla2fedmsg-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla2fedmsg:bugzilla2fedmsg-stg" - name: dole out the generic configuration hosts: bugzilla2fedmsg;bugzilla2fedmsg-stg diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 85a4fd179b..3a8c1370c4 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this builder on the buildvmhost # NOTE: most of these vars_path come from group_vars/buildvm or from hostvars -- name: make buildvm - hosts: buildvm:buildvm-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg" - name: make koji builder(s) hosts: buildvm:buildvm-stg diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index eab0844bfc..98c9d6a6cd 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -1,18 +1,4 @@ -- name: make busgateway server - hosts: busgateway;busgateway-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=busgateway:busgateway-stg" - name: dole out the generic configuration hosts: busgateway;busgateway-stg diff --git a/playbooks/groups/composers.yml b/playbooks/groups/composers.yml index aa3509d910..cbf31e37b5 100644 --- a/playbooks/groups/composers.yml +++ b/playbooks/groups/composers.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this instance on the buildvmhost # NOTE: most of these vars_path come from group_vars/releng or from hostvars -- name: make releng systems - hosts: composers;composers-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=composers:composers-stg" # Once the instance exists, configure it. diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 126e07be34..ed27ed386d 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -1,20 +1,6 @@ # create a new datagrepper server -- name: make datagrepper server - hosts: datagrepper;datagrepper-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=datagrepper:datagrepper-stg" - name: make the box be real hosts: datagrepper;datagrepper-stg diff --git a/playbooks/groups/dhcp.yml b/playbooks/groups/dhcp.yml index 6fa05c836e..1b361e58e7 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -1,18 +1,4 @@ -- name: make dhcp server - hosts: dhcp - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dhcp" - name: make the box be real hosts: dhcp diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml index bed78c55c3..e9072723cb 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -1,23 +1,6 @@ -# create a new fas server -# -# +# create a new dns server -- name: make dns server - hosts: dns - user: root - gather_facts: False - accelerate: "{{ accelerated }}" - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" - name: make the box be real hosts: dns diff --git a/playbooks/groups/docs-backend.yml b/playbooks/groups/docs-backend.yml index bd260e65ba..7f3e1e897b 100644 --- a/playbooks/groups/docs-backend.yml +++ b/playbooks/groups/docs-backend.yml @@ -1,18 +1,4 @@ -- name: make docs-backend server - hosts: docs-backend - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=docs-backend" - name: make the box be real hosts: docs-backend diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index be4b3d1d54..16357c4009 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -1,20 +1,4 @@ -- name: make secondary download virt - hosts: download-ibiblio - user: root - - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" - +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download-ibiblio" - name: Download servers hosts: download diff --git a/playbooks/groups/elections.yml b/playbooks/groups/elections.yml index 23da25e1cf..b2d558ef78 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -1,18 +1,4 @@ -- name: make elections - hosts: elections;elections-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=elections:elections-stg" - name: make the box be real hosts: elections;elections-stg diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index 274494da2b..e609feee4b 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -1,23 +1,6 @@ # create a new fas server -# -# -- name: make fas server - hosts: fas-stg:fas - user: root - gather_facts: False - accelerate: "{{ accelerated }}" - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas:fas-stg" - name: make the box be real hosts: fas-stg:fas diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 4e5664040d..3df7a346cd 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -1,21 +1,7 @@ # create a new fedimg server # NOTE: make sure there is room/space for this server on the vmhost -- name: make fedimg server - hosts: fedimg;fedimg-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedimg:fedimg-stg" - name: dole out the generic configuration hosts: fedimg;fedimg-stg diff --git a/playbooks/groups/gallery.yml b/playbooks/groups/gallery.yml index ec784d2063..1359730fb4 100644 --- a/playbooks/groups/gallery.yml +++ b/playbooks/groups/gallery.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/gallery-web* or from hostvars -- name: make gallery server - hosts: gallery-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gallery" - name: make the box be real hosts: gallery-stg diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index de608aa51c..3fb7d7a248 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/github2fedmsg* or from hostvars -- name: make github2fedmsg server - hosts: github2fedmsg;github2fedmsg-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=github2fedmsg:github2fedmsg-stg" - name: make the box be real hosts: github2fedmsg;github2fedmsg-stg diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index 0adca68120..3a9957e329 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make hotness server - hosts: hotness;hotness-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=hotness:hotness-stg" - name: dole out the generic configuration hosts: hotness;hotness-stg diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index ec1164a777..115a58b4a6 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/ipsilon* or from hostvars -- name: make ipsilon - hosts: ipsilon:ipsilon-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipsilon:ipsilon-stg" - name: make the box be real hosts: ipsilon:ipsilon-stg diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml index 354e12ebd5..70d3042b88 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/kerneltest* or from hostvars -- name: make kerneltest server - hosts: kerneltest-stg:kerneltest - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest:kerneltest-stg" - name: make the box be real hosts: kerneltest-stg:kerneltest diff --git a/playbooks/groups/keyserver.yml b/playbooks/groups/keyserver.yml index 60501f14fe..547c972f50 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/gallery-web* or from hostvars -- name: make sks keyserver - hosts: keys - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=keys" - name: make the box be real hosts: keys diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml index be1843cf6e..d7de77ec03 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -2,21 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/koji-hub or from hostvars -- name: make koji hub - hosts: koji-stg:koji01.phx2.fedoraproject.org:koji02.phx2.fedoraproject.org:s390-koji01.qa.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji01.phx2.fedoraproject.org:koji02.phx2.fedoraproject.org:s390-koji01.qa.fedoraproject.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index 388cebabec..06d17edcd0 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -1,18 +1,4 @@ -- name: make the servers - hosts: kojipkgs - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kojipkgs" - name: make the boxen be real for real hosts: kojipkgs diff --git a/playbooks/groups/koschei.yml b/playbooks/groups/koschei.yml index d836568914..52d20bb16f 100644 --- a/playbooks/groups/koschei.yml +++ b/playbooks/groups/koschei.yml @@ -1,18 +1,4 @@ -- name: make koschei - hosts: koschei:koschei-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei:koschei-stg" - name: install koschei hosts: koschei:koschei-stg diff --git a/playbooks/groups/lockbox.yml b/playbooks/groups/lockbox.yml index 84890225bc..559c70902b 100644 --- a/playbooks/groups/lockbox.yml +++ b/playbooks/groups/lockbox.yml @@ -1,18 +1,4 @@ -- name: make lockbox - hosts: lockbox - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=lockbox" - name: make the box be real hosts: lockbox diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 43b49cd24c..5573a49d87 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -1,18 +1,4 @@ -- name: make logs server - hosts: log01.phx2.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=log01.phx2.fedoraproject.org" - name: make the box be real hosts: log01.phx2.fedoraproject.org diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 9778ba82d5..515ccdd100 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -2,21 +2,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make mailman server - hosts: mailman-stg:mailman - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman-stg" - name: make the box be real hosts: mailman-stg:mailman diff --git a/playbooks/groups/mariadb-server.yml b/playbooks/groups/mariadb-server.yml index d3d7a5d736..cd432df710 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -2,21 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- name: make mariadb-server instance - hosts: db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index abe124ad92..794c2bf9d8 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -1,18 +1,4 @@ -- name: make memcached server - hosts: memcached:memcached-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=memcached:memcached-stg" - name: make the box be real hosts: memcached:memcached-stg diff --git a/playbooks/groups/mirrorlist2.yml b/playbooks/groups/mirrorlist2.yml index 2872a5cfb6..332b1bfe0d 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make mirrorlist app server - hosts: mirrorlist2:mirrorlist2-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mirrorlist2:mirrorlist2-stg" - name: make the box be real hosts: mirrorlist2:mirrorlist2-stg diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 96cf275933..f91f419afb 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -1,18 +1,4 @@ -- name: make the servers - hosts: mm;mm-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mm:mm-stg" - name: make the boxe be real for real hosts: mm;mm-stg diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 1d3befee38..f444407912 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -1,18 +1,4 @@ -- name: make nagios/noc server - hosts: nagios - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios" - name: make the box be real hosts: nagios diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 19b2ccfe64..f587120179 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make notifs-backend server - hosts: notifs-backend;notifs-backend-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-backend:notifs-backend-stg" - name: dole out the generic configuration hosts: notifs-backend;notifs-backend-stg diff --git a/playbooks/groups/notifs-web.yml b/playbooks/groups/notifs-web.yml index 6dca4fc3c7..d5d10f7802 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/notifs-web* or from hostvars -- name: make notifs-web server - hosts: notifs-web;notifs-web-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-web:notifs-web-stg" - name: make the box be real hosts: notifs-web;notifs-web-stg diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml index 8c5524bd2a..2ade85c6a2 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/nuancier* or from hostvars -- name: make nuancier - hosts: nuancier;nuancier-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nuancier:nuancier-stg" - name: make the box be real hosts: nuancier;nuancier-stg diff --git a/playbooks/groups/osbs.yml b/playbooks/groups/osbs.yml index 3c07ff0d82..3b0df8d7fd 100644 --- a/playbooks/groups/osbs.yml +++ b/playbooks/groups/osbs.yml @@ -1,18 +1,4 @@ -- name: make osbs server - hosts: osbs-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs-stg" # Once the instance exists, configure it. diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 8b8e8344aa..b0990a8072 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/packages* or from hostvars -- name: make packages server - hosts: packages;packages-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=packages:packages-stg" - name: make the box be real hosts: packages;packages-stg diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml index 8cc9ac7d36..61f7f53536 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -1,18 +1,4 @@ -- name: make the servers - hosts: pagure:pagure-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pagure:pagure-stg" - name: make the boxen be real for real hosts: pagure:pagure-stg diff --git a/playbooks/groups/paste.yml b/playbooks/groups/paste.yml index f17d292cf9..ab487c4026 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -1,18 +1,4 @@ -- name: make paste - hosts: paste-stg:paste - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=paste:paste-stg" - name: make the box be real hosts: paste-stg:paste diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 3684fb0b69..ba60a24541 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -1,21 +1,7 @@ # Create a people server # # -- name: make the people server - hosts: people01.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people01.fedoraproject.org" - name: make the box be real hosts: people01.fedoraproject.org diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index e46dd55958..493823358d 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -2,22 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/pkgdb* or from hostvars - -- name: make pkgdb - hosts: pkgdb-stg;pkgdb - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgdb:pkgdb-stg" - name: make the box be real hosts: pkgdb-stg;pkgdb diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml index b9372eb18b..eec646e1e2 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -1,18 +1,4 @@ -- name: make pkgs - hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.phx2.fedoraproject.org" - name: make the box be real hosts: pkgs-stg:pkgs02.phx2.fedoraproject.org diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 5df0341368..0f2d60b913 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -2,21 +2,7 @@ # NOTE: should be used with --limit most of the time # NOTE: most of these vars_path come from group_vars/backup_server or from hostvars -- name: make postgresql-server instance - hosts: db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.qa.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer02.phx2.fedoraproject.org:db-qa01.qa.fedoraproject.org:db-koji01.phx2.fedoraproject.org:db-fas01.stg.phx2.fedoraproject.org:db-fas01.phx2.fedoraproject.org:db01.phx2.fedoraproject.org:db01.stg.phx2.fedoraproject.org:db-s390-koji01.qa.fedoraproject.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 35137fdc65..c4482e3cd5 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -1,20 +1,6 @@ # create a new proxy server -- name: make new proxy server - hosts: proxies-stg:proxies - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg" - name: make the box be real hosts: proxies-stg:proxies diff --git a/playbooks/groups/qa-stg.yml b/playbooks/groups/qa-stg.yml index 81c2d5a53f..ede1ecb425 100644 --- a/playbooks/groups/qa-stg.yml +++ b/playbooks/groups/qa-stg.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron-ci staging - hosts: qa-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-stg" - name: make the box be real hosts: qa-stg diff --git a/playbooks/groups/qadevel.yml b/playbooks/groups/qadevel.yml index 3f180dc56b..20014aef2e 100644 --- a/playbooks/groups/qadevel.yml +++ b/playbooks/groups/qadevel.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: ensure qadevel instance is created - hosts: qadevel - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qadevel" - name: make the box be real hosts: qadevel diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index c8830447bc..22134ab50c 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -1,18 +1,4 @@ -- name: make releng systems - hosts: compose-x86-01.phx2.fedoraproject.org - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=compose-x86-01.phx2.fedoraproject.org" - name: Setup releng compose hosts hosts: releng-compose diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 94441cb100..82c646f1a7 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make resultsdb dev - hosts: resultsdb-dev - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-dev" - name: make the box be real hosts: resultsdb-dev diff --git a/playbooks/groups/resultsdb-prod.yml b/playbooks/groups/resultsdb-prod.yml index 0a09571948..8057333feb 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make resultsdb production - hosts: resultsdb-prod - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-prod" - name: make the box be real hosts: resultsdb-prod diff --git a/playbooks/groups/resultsdb-stg.yml b/playbooks/groups/resultsdb-stg.yml index 4fdab5230d..c04d43699d 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make resultsdb staging - hosts: resultsdb-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-stg" - name: make the box be real hosts: resultsdb-stg diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 81479b635d..45a5e794b6 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -1,19 +1,4 @@ -- name: make secondary arch download - hosts: secondary - user: root - - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=secondary" - name: setup secondary arch download server hosts: secondary diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index 32dbf8c7f1..ac1167c897 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -6,21 +6,7 @@ # Access is via management interface only. This playbook does initial setup. # Please check with rel-eng before doing anything here. -- name: make sign-bridge server vm - hosts: sign-bridge - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge" - name: configure sign bridge server hosts: sign-bridge diff --git a/playbooks/groups/smtp-mm.yml b/playbooks/groups/smtp-mm.yml index 7468f8b5bb..152c0eb618 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -1,20 +1,6 @@ # create smtp servers -- name: make smtp server - hosts: smtp-mm - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=smtp-mm" - name: make the box be real hosts: smtp-mm diff --git a/playbooks/groups/statscache.yml b/playbooks/groups/statscache.yml index f84afda0b6..233f5e817d 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -1,18 +1,4 @@ -- name: make statscache server - hosts: statscache;statscache-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=statscache:statscache-stg" - name: make the box be real hosts: statscache;statscache-stg diff --git a/playbooks/groups/summershum.yml b/playbooks/groups/summershum.yml index a503723aa4..240b88c81d 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make summershum server - hosts: summershum;summershum-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=summershum;summershum-stg" - name: dole out the generic configuration hosts: summershum;summershum-stg diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml index 24ab8be5b2..8ef598c518 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -3,21 +3,7 @@ # These servers run a number of smaller apps that don't merit their own instances. # -- name: make sundries server - hosts: sundries;sundries-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sundries:sundries-stg" - name: make the box be real hosts: sundries;sundries-stg diff --git a/playbooks/groups/tagger.yml b/playbooks/groups/tagger.yml index ed5b57277b..dc8d04268f 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/tagger* or from hostvars -- name: make tagger server - hosts: tagger;tagger-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=tagger:tagger-stg" - name: make the box be real hosts: tagger;tagger-stg diff --git a/playbooks/groups/taskotron-dev-clients.yml b/playbooks/groups/taskotron-dev-clients.yml index 71d0bbc693..1e498fa6c9 100644 --- a/playbooks/groups/taskotron-dev-clients.yml +++ b/playbooks/groups/taskotron-dev-clients.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron-dev clients - hosts: taskotron-dev-clients - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev-clients" - name: make the box be real hosts: taskotron-dev-clients diff --git a/playbooks/groups/taskotron-dev.yml b/playbooks/groups/taskotron-dev.yml index b88ee0cc3e..7149722b8f 100644 --- a/playbooks/groups/taskotron-dev.yml +++ b/playbooks/groups/taskotron-dev.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron dev - hosts: taskotron-dev - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev" - name: make the box be real hosts: taskotron-dev diff --git a/playbooks/groups/taskotron-prod-clients.yml b/playbooks/groups/taskotron-prod-clients.yml index 5589d03de0..bca6290e25 100644 --- a/playbooks/groups/taskotron-prod-clients.yml +++ b/playbooks/groups/taskotron-prod-clients.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron-prod clients - hosts: taskotron-prod-clients - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-prod-clients" - name: make the box be real hosts: taskotron-prod-clients diff --git a/playbooks/groups/taskotron-prod.yml b/playbooks/groups/taskotron-prod.yml index 02dc7dd7eb..713d6fa950 100644 --- a/playbooks/groups/taskotron-prod.yml +++ b/playbooks/groups/taskotron-prod.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron production - hosts: taskotron-prod - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-prod" - name: make the box be real hosts: taskotron-prod diff --git a/playbooks/groups/taskotron-stg-clients.yml b/playbooks/groups/taskotron-stg-clients.yml index b66cdc4dd2..77ffe171ea 100644 --- a/playbooks/groups/taskotron-stg-clients.yml +++ b/playbooks/groups/taskotron-stg-clients.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron-stg clients - hosts: taskotron-stg-clients - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-stg-clients" - name: make the box be real hosts: taskotron-stg-clients diff --git a/playbooks/groups/taskotron-stg.yml b/playbooks/groups/taskotron-stg.yml index 3859c62bd1..69abebe971 100644 --- a/playbooks/groups/taskotron-stg.yml +++ b/playbooks/groups/taskotron-stg.yml @@ -3,21 +3,7 @@ # NOTE: make sure there is room/space for this server on the vmhost # NOTE: most of these vars_path come from group_vars/mirrorlist or from hostvars -- name: make taskotron staging - hosts: taskotron-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-stg" - name: make the box be real hosts: taskotron-stg diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 92a9a42801..da47d03116 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -1,18 +1,4 @@ -- name: make torrent server - hosts: torrent - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-web;badges-web-stg" - name: make the box be real hosts: torrent diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index de11deaa96..26534d915a 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -1,18 +1,4 @@ -- name: make unbound - hosts: unbound - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=unbound" - name: make the box be real hosts: unbound diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml index 5589c12840..4a90e65d06 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -1,18 +1,4 @@ -- name: make value add servers - hosts: value:value-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=value:value-stg" - name: make the box be real hosts: value:value-stg diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml index 5adb880ba9..59d3effbe5 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -3,21 +3,7 @@ # These servers run mediawiki for the main fedora wiki instance. # -- name: make wiki server - hosts: wiki:wiki-stg - user: root - gather_facts: False - - vars_files: - - /srv/web/infra/ansible/vars/global.yml - - "/srv/private/ansible/vars.yml" - - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml - - tasks: - - include: "{{ tasks }}/virt_instance_create.yml" - - handlers: - - include: "{{ handlers }}/restart_services.yml" +- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=wiki:wiki-stg" - name: make the box be real hosts: wiki:wiki-stg