diff --git a/playbooks/groups/anitya.yml b/playbooks/groups/anitya.yml index 680b391440..7b1daf48d1 100644 --- a/playbooks/groups/anitya.yml +++ b/playbooks/groups/anitya.yml @@ -1,5 +1,5 @@ # create a new sks keyserver -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=anitya" +- import_playbook: "/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 ffd7cb4136..f7e72d57e4 100644 --- a/playbooks/groups/ask.yml +++ b/playbooks/groups/ask.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ask-stg:ask" +- import_playbook: "/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/autocloud-backend.yml b/playbooks/groups/autocloud-backend.yml index 3c8b3c5043..f0f88de57b 100644 --- a/playbooks/groups/autocloud-backend.yml +++ b/playbooks/groups/autocloud-backend.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-backend-stg" - name: dole out the generic configuration hosts: autocloud-backend:autocloud-backend-stg diff --git a/playbooks/groups/autocloud-web.yml b/playbooks/groups/autocloud-web.yml index b7d8907c93..4420b482b2 100644 --- a/playbooks/groups/autocloud-web.yml +++ b/playbooks/groups/autocloud-web.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-web:autocloud-web-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autocloud-web:autocloud-web-stg" - name: make the box be real hosts: autocloud-web:autocloud-web-stg diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml index 298cc23455..1b2fc67d50 100644 --- a/playbooks/groups/badges-backend.yml +++ b/playbooks/groups/badges-backend.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-backend:badges-backend-stg" +- import_playbook: "/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 df3804f8f6..ddbae26479 100644 --- a/playbooks/groups/badges-web.yml +++ b/playbooks/groups/badges-web.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=badges-web:badges-web-stg" +- import_playbook: "/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/basset.yml b/playbooks/groups/basset.yml index 7389846ae9..86c185da36 100644 --- a/playbooks/groups/basset.yml +++ b/playbooks/groups/basset.yml @@ -1,6 +1,6 @@ # create a new basset server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset:basset-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=basset:basset-stg" - name: make the box be real hosts: basset:basset-stg diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index 303cc650e5..79fd704b18 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bastion" +- import_playbook: "/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/batcave.yml b/playbooks/groups/batcave.yml index 2af96b10c8..caa38d6535 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=batcave" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=batcave" - name: make the box be real hosts: batcave diff --git a/playbooks/groups/beaker.yml b/playbooks/groups/beaker.yml index a0a9d5f685..976b11ccb5 100644 --- a/playbooks/groups/beaker.yml +++ b/playbooks/groups/beaker.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker:beaker-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=beaker:beaker-stg" - name: make the box be real hosts: beaker:beaker-stg diff --git a/playbooks/groups/blockerbugs.yml b/playbooks/groups/blockerbugs.yml index 707dfa61dc..e2000c3b44 100644 --- a/playbooks/groups/blockerbugs.yml +++ b/playbooks/groups/blockerbugs.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=blockerbugs:blockerbugs-stg" +- import_playbook: "/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 6338fe75d2..9c4975a47c 100644 --- a/playbooks/groups/bodhi-backend.yml +++ b/playbooks/groups/bodhi-backend.yml @@ -5,7 +5,7 @@ # They also run some misc releng scripts. # -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi-backend:bodhi-backend-stg" +- import_playbook: "/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 fa6fb352d7..cedf473ec0 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bodhi2:bodhi2-stg" +- import_playbook: "/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/bugyou.yml b/playbooks/groups/bugyou.yml index c2b4eea768..5eec46e16b 100644 --- a/playbooks/groups/bugyou.yml +++ b/playbooks/groups/bugyou.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugyou:bugyou-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugyou:bugyou-stg" - name: dole out the generic configuration hosts: bugyou:bugyou-stg diff --git a/playbooks/groups/bugzilla2fedmsg.yml b/playbooks/groups/bugzilla2fedmsg.yml index 44e18a4b51..4482b84304 100644 --- a/playbooks/groups/bugzilla2fedmsg.yml +++ b/playbooks/groups/bugzilla2fedmsg.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla2fedmsg:bugzilla2fedmsg-stg" +- import_playbook: "/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/buildhw.yml b/playbooks/groups/buildhw.yml index ac3d0ab0f9..db877ef8c5 100644 --- a/playbooks/groups/buildhw.yml +++ b/playbooks/groups/buildhw.yml @@ -3,7 +3,7 @@ # NOTE: most of these vars_path come from group_vars/buildhw or from hostvars - name: make koji builder(s) on raw hw - hosts: buildhw:buildaarch64:buildppc64:bkernel + hosts: buildhw:buildaarch64:bkernel remote_user: root gather_facts: True diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index f22474eceb..b4290d0488 100644 --- a/playbooks/groups/buildvm.yml +++ b/playbooks/groups/buildvm.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg" - name: make koji builder(s) hosts: buildvm:buildvm-stg:buildvm-aarch64:buildvm-armv7:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390:buildvm-ppc64-stg:buildvm-ppc64le-stg:buildvm-aarch64-stg:buildvm-armv7-stg:buildvm-s390x diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml index 00af286a77..a9ebf1806f 100644 --- a/playbooks/groups/busgateway.yml +++ b/playbooks/groups/busgateway.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=busgateway:busgateway-stg" +- import_playbook: "/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/certgetter.yml b/playbooks/groups/certgetter.yml index 9dbcf3a801..40a99b636f 100644 --- a/playbooks/groups/certgetter.yml +++ b/playbooks/groups/certgetter.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter" - name: make the box be real hosts: certgetter diff --git a/playbooks/groups/ci.yml b/playbooks/groups/ci.yml index 13db764f61..f0ff0c13cc 100644 --- a/playbooks/groups/ci.yml +++ b/playbooks/groups/ci.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ci-cc-rdu01.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ci-cc-rdu01.fedoraproject.org" - name: make the box be real hosts: ci diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index c74ec9f66c..aa7a209578 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-backend:darkserver-backend-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-backend:darkserver-backend-stg" - name: make the box be real hosts: darkserver-backend:darkserver-backend-stg diff --git a/playbooks/groups/darkserver-web.yml b/playbooks/groups/darkserver-web.yml index 92e285786a..95a35b41b8 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-web:darkserver-web-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver-web:darkserver-web-stg" - name: make the box be real hosts: darkserver-web:darkserver-web-stg diff --git a/playbooks/groups/darkserver.yml b/playbooks/groups/darkserver.yml index 3e28903ab3..ff99e20743 100644 --- a/playbooks/groups/darkserver.yml +++ b/playbooks/groups/darkserver.yml @@ -1,7 +1,7 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver:darkserver-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=darkserver:darkserver-stg" - name: make the box be real - hosts: darkserver:darkserver-stg + hosts: darkserver user: root gather_facts: True diff --git a/playbooks/groups/datagrepper.yml b/playbooks/groups/datagrepper.yml index 0cc9fbcb68..5010196390 100644 --- a/playbooks/groups/datagrepper.yml +++ b/playbooks/groups/datagrepper.yml @@ -1,6 +1,6 @@ # create a new datagrepper server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=datagrepper:datagrepper-stg" +- import_playbook: "/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 a7612b1524..be56fe0d19 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dhcp" +- import_playbook: "/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 2461d94cb8..d8ba1e140b 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -1,6 +1,6 @@ # create a new dns server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" - name: make the box be real hosts: dns diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml index e00787fd17..1fed4f6e3f 100644 --- a/playbooks/groups/download.yml +++ b/playbooks/groups/download.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download-ibiblio" +- import_playbook: "/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 d1b8217eb2..e8c8180034 100644 --- a/playbooks/groups/elections.yml +++ b/playbooks/groups/elections.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=elections:elections-stg" +- import_playbook: "/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 4b11497109..7df2df50a9 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -1,6 +1,6 @@ # create a new fas server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas:fas-stg" +- import_playbook: "/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/fas3.yml b/playbooks/groups/fas3.yml index 0ee783015c..a5125057ef 100644 --- a/playbooks/groups/fas3.yml +++ b/playbooks/groups/fas3.yml @@ -1,6 +1,6 @@ # create a new fas server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas3-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fas3-stg" - name: make the box be real hosts: fas3-stg diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml index 88d7aaea6c..ec1be56af4 100644 --- a/playbooks/groups/fedimg.yml +++ b/playbooks/groups/fedimg.yml @@ -1,7 +1,7 @@ # create a new fedimg server # NOTE: make sure there is room/space for this server on the vmhost -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedimg:fedimg-stg" +- import_playbook: "/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/fedocal.yml b/playbooks/groups/fedocal.yml index b24ccced70..ae0e5326fd 100644 --- a/playbooks/groups/fedocal.yml +++ b/playbooks/groups/fedocal.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedocal-stg:fedocal" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=fedocal-stg:fedocal" - name: make the box be real hosts: fedocal-stg:fedocal diff --git a/playbooks/groups/freshmaker.yml b/playbooks/groups/freshmaker.yml index efafe0743d..8933eb5d12 100644 --- a/playbooks/groups/freshmaker.yml +++ b/playbooks/groups/freshmaker.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=freshmaker:freshmaker-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=freshmaker:freshmaker-stg" - name: make the box be real hosts: freshmaker:freshmaker-stg diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index de63d753ec..7b43639920 100644 --- a/playbooks/groups/github2fedmsg.yml +++ b/playbooks/groups/github2fedmsg.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=github2fedmsg:github2fedmsg-stg" +- import_playbook: "/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/gnome-backups.yml b/playbooks/groups/gnome-backups.yml index 224dc9a4cf..1122ee818d 100644 --- a/playbooks/groups/gnome-backups.yml +++ b/playbooks/groups/gnome-backups.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gnome-backups" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=gnome-backups" - name: make the boxen be real for real hosts: gnome-backups diff --git a/playbooks/groups/hosted.yml b/playbooks/groups/hosted.yml index 21c8b6e8be..19168f4c65 100644 --- a/playbooks/groups/hosted.yml +++ b/playbooks/groups/hosted.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=newhosted" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=newhosted" - name: make the boxen be real for real hosts: newhosted diff --git a/playbooks/groups/hotness.yml b/playbooks/groups/hotness.yml index 58c9a96222..e105435d36 100644 --- a/playbooks/groups/hotness.yml +++ b/playbooks/groups/hotness.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=hotness:hotness-stg" +- import_playbook: "/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/infinote.yml b/playbooks/groups/infinote.yml index 149bfb336e..73f4e68224 100644 --- a/playbooks/groups/infinote.yml +++ b/playbooks/groups/infinote.yml @@ -1,5 +1,5 @@ # create a new infinote server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=infinote" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=infinote" - name: make the boxen be real for real hosts: infinote diff --git a/playbooks/groups/ipa.yml b/playbooks/groups/ipa.yml index 41c6f068fe..265c9dcea1 100644 --- a/playbooks/groups/ipa.yml +++ b/playbooks/groups/ipa.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipa:ipa-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipa:ipa-stg" - name: make the box be real hosts: ipa:ipa-stg diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml index 6cd0c9b959..bf16099836 100644 --- a/playbooks/groups/ipsilon.yml +++ b/playbooks/groups/ipsilon.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=ipsilon:ipsilon-stg" +- import_playbook: "/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 3928a341c6..55ce3350d0 100644 --- a/playbooks/groups/kerneltest.yml +++ b/playbooks/groups/kerneltest.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest:kerneltest-stg" +- import_playbook: "/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 2747e12b32..6c9b346440 100644 --- a/playbooks/groups/keyserver.yml +++ b/playbooks/groups/keyserver.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=keys" +- import_playbook: "/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 39e7301687..8aba744af2 100644 --- a/playbooks/groups/koji-hub.yml +++ b/playbooks/groups/koji-hub.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji" # Once the instance exists, configure it. diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index 8346f40217..7b71030613 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kojipkgs" +- import_playbook: "/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-backend.yml b/playbooks/groups/koschei-backend.yml index d1a6e5209c..c0a2108fc7 100644 --- a/playbooks/groups/koschei-backend.yml +++ b/playbooks/groups/koschei-backend.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-backend:koschei-backend-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-backend:koschei-backend-stg" - name: install koschei hosts: koschei-backend:koschei-backend-stg diff --git a/playbooks/groups/koschei-web.yml b/playbooks/groups/koschei-web.yml index 49781aea7c..4f1b85b120 100644 --- a/playbooks/groups/koschei-web.yml +++ b/playbooks/groups/koschei-web.yml @@ -1,5 +1,5 @@ --- -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-web:koschei-web-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koschei-web:koschei-web-stg" - name: install koschei-frontend hosts: koschei-web:koschei-web-stg diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml index 4c8d38f47e..90490cef29 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=log01.phx2.fedoraproject.org" +- import_playbook: "/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/loopabull.yml b/playbooks/groups/loopabull.yml index dbd04aef6a..0ca3ecc4cf 100644 --- a/playbooks/groups/loopabull.yml +++ b/playbooks/groups/loopabull.yml @@ -1,5 +1,5 @@ # create a new loopabull server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=loopabull-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=loopabull-stg" - name: make the box be real hosts: loopabull-stg diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index 234341891a..3e310791f9 100644 --- a/playbooks/groups/mailman.yml +++ b/playbooks/groups/mailman.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mailman:mailman-stg" +- import_playbook: "/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 dd33185367..69bc3936ca 100644 --- a/playbooks/groups/mariadb-server.yml +++ b/playbooks/groups/mariadb-server.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.phx2.fedoraproject.org:db03.stg.phx2.fedoraproject.org" +- import_playbook: "/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/mbs.yml b/playbooks/groups/mbs.yml index 585308ae98..3d708ab05a 100644 --- a/playbooks/groups/mbs.yml +++ b/playbooks/groups/mbs.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mbs:mbs-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mbs:mbs-stg" - name: make the box be real hosts: mbs:mbs-stg diff --git a/playbooks/groups/mdapi.yml b/playbooks/groups/mdapi.yml index 58db4c021a..0636c3bb95 100644 --- a/playbooks/groups/mdapi.yml +++ b/playbooks/groups/mdapi.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mdapi:mdapi-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mdapi:mdapi-stg" - name: make the box be real hosts: mdapi-stg:mdapi diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index b1cff10554..ce48cb5745 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=memcached:memcached-stg" +- import_playbook: "/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 6d0fa43859..18fb6ea5ab 100644 --- a/playbooks/groups/mirrorlist2.yml +++ b/playbooks/groups/mirrorlist2.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mirrorlist2:mirrorlist2-stg:!mirrorlist-host1plus.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mirrorlist2:mirrorlist2-stg:!mirrorlist-host1plus.fedoraproject.org" - name: make the box be real hosts: mirrorlist2:mirrorlist2-stg diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml index 85cca92cc3..4883c36750 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mm:mm-stg" +- import_playbook: "/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/modernpaste.yml b/playbooks/groups/modernpaste.yml index aa7ad4a166..037037fbf0 100644 --- a/playbooks/groups/modernpaste.yml +++ b/playbooks/groups/modernpaste.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg:modernpaste" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=modernpaste-stg:modernpaste" - name: dole out the generic configuration hosts: modernpaste-stg:modernpaste diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 495ee62734..128d7f4c51 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -1,5 +1,5 @@ # This is a basic playbook -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios" +- import_playbook: "/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 ea99d7f78a..7edb24f29d 100644 --- a/playbooks/groups/notifs-backend.yml +++ b/playbooks/groups/notifs-backend.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-backend:notifs-backend-stg" +- import_playbook: "/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 8ba9b8728d..f9984e4e07 100644 --- a/playbooks/groups/notifs-web.yml +++ b/playbooks/groups/notifs-web.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=notifs-web:notifs-web-stg" +- import_playbook: "/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 f2fa04f7b7..bfced0be1b 100644 --- a/playbooks/groups/nuancier.yml +++ b/playbooks/groups/nuancier.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nuancier:nuancier-stg" +- import_playbook: "/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/odcs.yml b/playbooks/groups/odcs.yml index 54cc6ae3d2..a26b43caae 100644 --- a/playbooks/groups/odcs.yml +++ b/playbooks/groups/odcs.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=odcs:odcs-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=odcs:odcs-stg" - name: make the box be real hosts: odcs:odcs-stg diff --git a/playbooks/groups/openqa.yml b/playbooks/groups/openqa.yml index 828f411e06..798dc1f8b6 100644 --- a/playbooks/groups/openqa.yml +++ b/playbooks/groups/openqa.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa-stg" - name: setup base openqa host hosts: openqa:openqa-stg diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 46a51c75f8..2d47e7622e 100644 --- a/playbooks/groups/packages.yml +++ b/playbooks/groups/packages.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=packages:packages-stg" +- import_playbook: "/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 5851b8ebae..9a7c82ef5d 100644 --- a/playbooks/groups/pagure.yml +++ b/playbooks/groups/pagure.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pagure:pagure-stg" +- import_playbook: "/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 0e81cf59ec..2871017b05 100644 --- a/playbooks/groups/paste.yml +++ b/playbooks/groups/paste.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=paste:paste-stg" +- import_playbook: "/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/pdc.yml b/playbooks/groups/pdc.yml index 93df2254fe..dcc5320584 100644 --- a/playbooks/groups/pdc.yml +++ b/playbooks/groups/pdc.yml @@ -1,6 +1,6 @@ # PDC servers (both frontend and backend) -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg" - name: dole out the generic configuration hosts: pdc-web:pdc-web-stg:pdc-backend:pdc-backend-stg diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml index 26d528f9ab..9422478234 100644 --- a/playbooks/groups/people.yml +++ b/playbooks/groups/people.yml @@ -1,7 +1,7 @@ # Create a people server # # -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people" - name: make the box be real hosts: people diff --git a/playbooks/groups/piwik.yml b/playbooks/groups/piwik.yml index f0592ebccd..633cb79b40 100644 --- a/playbooks/groups/piwik.yml +++ b/playbooks/groups/piwik.yml @@ -1,6 +1,6 @@ # These servers run piwik -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=piwik-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=piwik-stg" - name: make the box be real hosts: piwik-stg diff --git a/playbooks/groups/pkgdb.yml b/playbooks/groups/pkgdb.yml index 211be8f2ae..32b67ff1eb 100644 --- a/playbooks/groups/pkgdb.yml +++ b/playbooks/groups/pkgdb.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgdb:pkgdb-stg" +- import_playbook: "/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 e30c027d4d..b540dbe72d 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.phx2.fedoraproject.org" +- import_playbook: "/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-bdr.yml b/playbooks/groups/postgresql-server-bdr.yml index 9dc813c89c..077c4adb29 100644 --- a/playbooks/groups/postgresql-server-bdr.yml +++ b/playbooks/groups/postgresql-server-bdr.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org:pgbdr01.stg.phx2.fedoraproject.org:pgbdr02.stg.phx2.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-koji01.stg.phx2.fedoraproject.org:db-koji02.stg.phx2.fedoraproject.org:pgbdr01.stg.phx2.fedoraproject.org:pgbdr02.stg.phx2.fedoraproject.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index 9991adfca1..d900df2097 100644 --- a/playbooks/groups/postgresql-server.yml +++ b/playbooks/groups/postgresql-server.yml @@ -2,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer01.phx2.fedoraproject.org: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.s390.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org:db-qa02.qa.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-datanommer01.phx2.fedoraproject.org: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.s390.fedoraproject.org:db-arm-koji01.qa.fedoraproject.org:db-ppc-koji01.ppc.fedoraproject.org:db-qa-stg01.qa.fedoraproject.org:db-qa02.qa.fedoraproject.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 6a4a071ecc..9b567a8a57 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -1,6 +1,6 @@ # create a new proxy server -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg:!proxy07.fedoraproject.org:!proxy05.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg:!proxy07.fedoraproject.org:!proxy05.fedoraproject.org" - name: make the box be real hosts: proxies-stg:proxies diff --git a/playbooks/groups/qa.yml b/playbooks/groups/qa.yml index 951c68486b..f4ea874ed3 100644 --- a/playbooks/groups/qa.yml +++ b/playbooks/groups/qa.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-prod:qa-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=qa-prod:qa-stg" - name: make the box be real hosts: qa-prod:qa-stg diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml index ef5a0d331e..e0e97fba3d 100644 --- a/playbooks/groups/releng-compose.yml +++ b/playbooks/groups/releng-compose.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg:compose-ppc64-01.ppc.fedoraproject.org:compose-ppc64le-01.ppc.fedoraproject.org:compose-s390-01.s390.fedoraproject.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng-compose:releng-stg:compose-ppc64-01.ppc.fedoraproject.org:compose-ppc64le-01.ppc.fedoraproject.org:compose-s390-01.s390.fedoraproject.org" - name: Setup releng compose hosts hosts: releng-compose:releng-secondary:releng-stg diff --git a/playbooks/groups/resultsdb-dev.yml b/playbooks/groups/resultsdb-dev.yml index 51f39a5ff3..4be24636eb 100644 --- a/playbooks/groups/resultsdb-dev.yml +++ b/playbooks/groups/resultsdb-dev.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-dev" +- import_playbook: "/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 1539f1fa77..26a6d6aa7e 100644 --- a/playbooks/groups/resultsdb-prod.yml +++ b/playbooks/groups/resultsdb-prod.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-prod" +- import_playbook: "/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 40429fac76..0511245157 100644 --- a/playbooks/groups/resultsdb-stg.yml +++ b/playbooks/groups/resultsdb-stg.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=resultsdb-stg" +- import_playbook: "/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/retrace.yml b/playbooks/groups/retrace.yml index 022a3f34d6..e9565416ae 100644 --- a/playbooks/groups/retrace.yml +++ b/playbooks/groups/retrace.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=faf-stg:retrace-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=faf-stg:retrace-stg" - name: Setup retrace hosts hosts: retrace:faf-stg:retrace-stg diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml index 6728e3c1b5..4e941f116f 100644 --- a/playbooks/groups/secondary.yml +++ b/playbooks/groups/secondary.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=secondary" +- import_playbook: "/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 a7981b4ca2..a4923f955e 100644 --- a/playbooks/groups/sign-bridge.yml +++ b/playbooks/groups/sign-bridge.yml @@ -6,7 +6,7 @@ # Access is via management interface only. This playbook does initial setup. # Please check with rel-eng before doing anything here. -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign-bridge" +- import_playbook: "/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 b782fe0ba6..d8588bbd93 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -1,6 +1,6 @@ # create smtp servers -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=smtp-mm" +- import_playbook: "/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 2205cdac43..197e14732c 100644 --- a/playbooks/groups/statscache.yml +++ b/playbooks/groups/statscache.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=statscache:statscache-stg" +- import_playbook: "/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 4313c7d3b4..a58e282e35 100644 --- a/playbooks/groups/summershum.yml +++ b/playbooks/groups/summershum.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=summershum:summershum-stg" +- import_playbook: "/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 bb1a981a70..2018ffed77 100644 --- a/playbooks/groups/sundries.yml +++ b/playbooks/groups/sundries.yml @@ -3,7 +3,7 @@ # These servers run a number of smaller apps that don't merit their own instances. # -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sundries:sundries-stg" +- import_playbook: "/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 6ebc4a7248..73edbac6c7 100644 --- a/playbooks/groups/tagger.yml +++ b/playbooks/groups/tagger.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=tagger:tagger-stg" +- import_playbook: "/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.yml b/playbooks/groups/taskotron.yml index f35374faee..0c2f0ef6af 100644 --- a/playbooks/groups/taskotron.yml +++ b/playbooks/groups/taskotron.yml @@ -3,7 +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 -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev:taskotron-stg:taskotron-prod" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=taskotron-dev:taskotron-stg:taskotron-prod" - name: make the box be real hosts: taskotron-dev:taskotron-stg:taskotron-prod diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml index 6e5f4306c2..3372c88e4c 100644 --- a/playbooks/groups/torrent.yml +++ b/playbooks/groups/torrent.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=torrent" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=torrent" - name: make the box be real hosts: torrent diff --git a/playbooks/groups/transitional-datanommer.yml b/playbooks/groups/transitional-datanommer.yml index 36d05197e6..d6e25d8d9d 100644 --- a/playbooks/groups/transitional-datanommer.yml +++ b/playbooks/groups/transitional-datanommer.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=transitional-datanommer" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=transitional-datanommer" - name: dole out the generic configuration hosts: transitional-datanommer diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml index dc46d444ba..81392e063d 100644 --- a/playbooks/groups/unbound.yml +++ b/playbooks/groups/unbound.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=unbound" +- import_playbook: "/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 58949368e3..a6d06c33de 100644 --- a/playbooks/groups/value.yml +++ b/playbooks/groups/value.yml @@ -1,4 +1,4 @@ -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=value:value-stg" +- import_playbook: "/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 ed92236130..44be715968 100644 --- a/playbooks/groups/wiki.yml +++ b/playbooks/groups/wiki.yml @@ -3,7 +3,7 @@ # These servers run mediawiki for the main fedora wiki instance. # -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=wiki:wiki-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=wiki:wiki-stg" - name: make the box be real hosts: wiki:wiki-stg diff --git a/playbooks/groups/zanata2fedmsg.yml b/playbooks/groups/zanata2fedmsg.yml index 7ec8e58956..6c69d147fa 100644 --- a/playbooks/groups/zanata2fedmsg.yml +++ b/playbooks/groups/zanata2fedmsg.yml @@ -3,7 +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/zanata2fedmsg* or from hostvars -- include_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zanata2fedmsg:zanata2fedmsg-stg" - name: make the box be real hosts: zanata2fedmsg:zanata2fedmsg-stg