From a961a5ed7d57acd01f59209b24bf6c8d92cc1d9f Mon Sep 17 00:00:00 2001
From: Andrew Heath <anheath@redhat.com>
Date: Thu, 18 May 2023 15:28:34 -0400
Subject: [PATCH] updating playbooks to work with ansible 2.14

---
 playbooks/groups/badges-backend.yml    | 4 +++-
 playbooks/groups/badges-web.yml        | 4 +++-
 playbooks/groups/basset.yml            | 4 +++-
 playbooks/groups/bastion.yml           | 2 +-
 playbooks/groups/batcave.yml           | 2 +-
 playbooks/groups/bodhi-backend.yml     | 4 +++-
 playbooks/groups/buildhw.yml           | 4 +++-
 playbooks/groups/buildvm.yml           | 4 +++-
 playbooks/groups/busgateway.yml        | 4 +++-
 playbooks/groups/centos-ipa-client.yml | 4 +++-
 playbooks/groups/certgetter.yml        | 4 +++-
 playbooks/groups/data-reports.yml      | 4 +++-
 playbooks/groups/debuginfod.yml        | 4 +++-
 playbooks/groups/dns.yml               | 4 +++-
 playbooks/groups/download.yml          | 4 +++-
 playbooks/groups/fedimg.yml            | 4 +++-
 playbooks/groups/github2fedmsg.yml     | 4 +++-
 playbooks/groups/ipsilon.yml           | 4 +++-
 playbooks/groups/kerneltest.yml        | 4 +++-
 playbooks/groups/koji-hub.yml          | 4 +++-
 playbooks/groups/kojipkgs.yml          | 4 +++-
 playbooks/groups/logserver.yml         | 4 +++-
 playbooks/groups/mailman.yml           | 4 +++-
 playbooks/groups/mariadb-server.yml    | 4 +++-
 playbooks/groups/mbs.yml               | 4 +++-
 playbooks/groups/memcached.yml         | 4 +++-
 playbooks/groups/mirrormanager.yml     | 4 +++-
 playbooks/groups/noc.yml               | 4 +++-
 playbooks/groups/nuancier.yml          | 4 +++-
 playbooks/groups/oci-registry.yml      | 4 +++-
 playbooks/groups/odcs.yml              | 4 +++-
 playbooks/groups/openqa.yml            | 4 +++-
 playbooks/groups/os-proxies.yml        | 4 +++-
 playbooks/groups/pagure.yml            | 4 +++-
 playbooks/groups/pdc.yml               | 4 +++-
 playbooks/groups/people.yml            | 4 +++-
 playbooks/groups/pkgs.yml              | 4 +++-
 playbooks/groups/postgresql-server.yml | 4 +++-
 playbooks/groups/proxies.yml           | 4 +++-
 playbooks/groups/rabbitmq.yml          | 4 +++-
 playbooks/groups/releng-compose.yml    | 4 +++-
 playbooks/groups/secondary.yml         | 4 +++-
 playbooks/groups/sign-bridge.yml       | 4 +++-
 playbooks/groups/smtp-mm.yml           | 4 +++-
 playbooks/groups/sundries.yml          | 4 +++-
 playbooks/groups/tang.yml              | 4 +++-
 playbooks/groups/torrent.yml           | 4 +++-
 playbooks/groups/unbound.yml           | 4 +++-
 playbooks/groups/value.yml             | 4 +++-
 playbooks/groups/virthost.yml          | 4 +++-
 playbooks/groups/wiki.yml              | 4 +++-
 playbooks/groups/zabbix.yml            | 4 +++-
 52 files changed, 152 insertions(+), 52 deletions(-)

diff --git a/playbooks/groups/badges-backend.yml b/playbooks/groups/badges-backend.yml
index 960c657767..14b6dd0ab1 100644
--- a/playbooks/groups/badges-backend.yml
+++ b/playbooks/groups/badges-backend.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_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"
+  vars:
+    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 ea25b8c3b7..f9d911cd2f 100644
--- a/playbooks/groups/badges-web.yml
+++ b/playbooks/groups/badges-web.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_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"
+  vars:
+    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 f96ba59d9b..2222d649fc 100644
--- a/playbooks/groups/basset.yml
+++ b/playbooks/groups/basset.yml
@@ -1,6 +1,8 @@
 # create a new basset server
 
-- import_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"
+  vars:
+    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 7e0f6c11bf..0989a8e0d9 100644
--- a/playbooks/groups/bastion.yml
+++ b/playbooks/groups/bastion.yml
@@ -1,6 +1,6 @@
 - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
   vars:
-    myhosts: bastion
+    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 6df3990f8f..9f60b949a5 100644
--- a/playbooks/groups/batcave.yml
+++ b/playbooks/groups/batcave.yml
@@ -1,6 +1,6 @@
 - import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
   vars:
-    myhosts: batcave
+    myhosts: "batcave"
 
 - name: make the box be real
   hosts: batcave
diff --git a/playbooks/groups/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml
index d82e5d660b..c22ad41f42 100644
--- a/playbooks/groups/bodhi-backend.yml
+++ b/playbooks/groups/bodhi-backend.yml
@@ -5,7 +5,9 @@
 # They also run some misc releng scripts.
 #
 
-- import_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"
+  vars:
+    myhosts: "bodhi_backend:bodhi_backend_stg"
 
 # Once the instance exists, configure it.
 
diff --git a/playbooks/groups/buildhw.yml b/playbooks/groups/buildhw.yml
index c76fb2d1aa..055c98ee58 100644
--- a/playbooks/groups/buildhw.yml
+++ b/playbooks/groups/buildhw.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=buildhw:bkernel"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml"
+  vars:
+    myhosts: "buildhw:bkernel"
 
 - name: make koji builder(s) on raw hw
   hosts: buildhw:bkernel
diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml
index 26824e338d..14e2cab742 100644
--- a/playbooks/groups/buildvm.yml
+++ b/playbooks/groups/buildvm.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x_kvm"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x_kvm"
 
 - name: make koji builder(s)
   hosts: buildvm:buildvm_stg:buildvm_aarch64:buildvm_ppc64le:buildvm_ppc64le_stg:buildvm_aarch64_stg:buildvm_s390x:buildvm_s390x_stg
diff --git a/playbooks/groups/busgateway.yml b/playbooks/groups/busgateway.yml
index 0d57205974..5ac68795b8 100644
--- a/playbooks/groups/busgateway.yml
+++ b/playbooks/groups/busgateway.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    myhosts: "busgateway:busgateway_stg"
 
 - name: dole out the generic configuration
   hosts: busgateway:busgateway_stg
diff --git a/playbooks/groups/centos-ipa-client.yml b/playbooks/groups/centos-ipa-client.yml
index b79bc7da8a..53d59bca5c 100644
--- a/playbooks/groups/centos-ipa-client.yml
+++ b/playbooks/groups/centos-ipa-client.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=centos_ipa_client_stg"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "centos_ipa_client_stg"
 
 - name: make the boxes be realen
   hosts: centos_ipa_client_stg
diff --git a/playbooks/groups/certgetter.yml b/playbooks/groups/certgetter.yml
index 90582badb1..00db8c92b6 100644
--- a/playbooks/groups/certgetter.yml
+++ b/playbooks/groups/certgetter.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=certgetter"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "certgetter"
 
 - name: make the box be real
   hosts: certgetter
diff --git a/playbooks/groups/data-reports.yml b/playbooks/groups/data-reports.yml
index 41236deda9..c67815e56d 100644
--- a/playbooks/groups/data-reports.yml
+++ b/playbooks/groups/data-reports.yml
@@ -1,7 +1,9 @@
 # create a data-reports vm
 #
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=data_reports"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "data_reports"
 
 - name: make the box be real
   hosts: data_reports
diff --git a/playbooks/groups/debuginfod.yml b/playbooks/groups/debuginfod.yml
index 59fff69d7b..8fcef7da44 100644
--- a/playbooks/groups/debuginfod.yml
+++ b/playbooks/groups/debuginfod.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=debuginfod:debuginfod_stg"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "debuginfod:debuginfod_stg"
 
 - name: make the box be real
   hosts: debuginfod:debuginfod_stg
diff --git a/playbooks/groups/dns.yml b/playbooks/groups/dns.yml
index fbf5a352ea..f5cc760d50 100644
--- a/playbooks/groups/dns.yml
+++ b/playbooks/groups/dns.yml
@@ -1,6 +1,8 @@
 # create a new dns server
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "dns"
 
 - name: make the box be real
   hosts: dns
diff --git a/playbooks/groups/download.yml b/playbooks/groups/download.yml
index 7bd1fd44cb..1a68cf7d17 100644
--- a/playbooks/groups/download.yml
+++ b/playbooks/groups/download.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=download_ibiblio:download_cc_rdu:download_iad2"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "download_ibiblio:download_cc_rdu:download_iad2"
 
 - name: Download servers
   hosts: download
diff --git a/playbooks/groups/fedimg.yml b/playbooks/groups/fedimg.yml
index 2d873116a9..60c4c48c6d 100644
--- a/playbooks/groups/fedimg.yml
+++ b/playbooks/groups/fedimg.yml
@@ -1,7 +1,9 @@
 # create a new fedimg server
 # NOTE: make sure there is room/space for this server on the vmhost
 
-- import_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"
+  vars:
+    myhosts: "fedimg:fedimg_stg"
 
 - name: dole out the generic configuration
   hosts: fedimg:fedimg_stg
diff --git a/playbooks/groups/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml
index 8ace27be8f..619f0f58ff 100644
--- a/playbooks/groups/github2fedmsg.yml
+++ b/playbooks/groups/github2fedmsg.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_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"
+  vars:
+    myhosts: "github2fedmsg:github2fedmsg_stg"
 
 - name: make the box be real
   hosts: github2fedmsg:github2fedmsg_stg
diff --git a/playbooks/groups/ipsilon.yml b/playbooks/groups/ipsilon.yml
index 380058d9ac..5a914b6141 100644
--- a/playbooks/groups/ipsilon.yml
+++ b/playbooks/groups/ipsilon.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    myhosts: "ipsilon:ipsilon_stg"
 
 
 - name: make the box be real
diff --git a/playbooks/groups/kerneltest.yml b/playbooks/groups/kerneltest.yml
index 88cf11d2bb..d15c5717fd 100644
--- a/playbooks/groups/kerneltest.yml
+++ b/playbooks/groups/kerneltest.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kerneltest"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "kerneltest"
 
 - name: make the box be real
   hosts: kerneltest
diff --git a/playbooks/groups/koji-hub.yml b/playbooks/groups/koji-hub.yml
index 34bf19b899..7ef167eb51 100644
--- a/playbooks/groups/koji-hub.yml
+++ b/playbooks/groups/koji-hub.yml
@@ -2,7 +2,9 @@
 # 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
 
-- import_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"
+  vars:
+    myhosts: "koji_stg:koji"
 
 # Once the instance exists, configure it.
 
diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml
index 3e43424745..364e38f54b 100644
--- a/playbooks/groups/kojipkgs.yml
+++ b/playbooks/groups/kojipkgs.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=kojipkgs"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "kojipkgs"
 
 - name: make the boxen be real for real
   hosts: kojipkgs
diff --git a/playbooks/groups/logserver.yml b/playbooks/groups/logserver.yml
index 4cdb686f46..d7560b0c8b 100644
--- a/playbooks/groups/logserver.yml
+++ b/playbooks/groups/logserver.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=logging"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "logging"
 
 - name: make the box be real
   hosts: logging
diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml
index 059e2cfe11..88058da083 100644
--- a/playbooks/groups/mailman.yml
+++ b/playbooks/groups/mailman.yml
@@ -2,7 +2,9 @@
 # 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
 
-- import_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"
+  vars:
+    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 3308ce9a79..c78ef4be76 100644
--- a/playbooks/groups/mariadb-server.yml
+++ b/playbooks/groups/mariadb-server.yml
@@ -2,7 +2,9 @@
 # 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
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.stg.iad2.fedoraproject.org:db03.iad2.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "db03.stg.iad2.fedoraproject.org:db03.iad2.fedoraproject.org"
 
 # Once the instance exists, configure it.
 
diff --git a/playbooks/groups/mbs.yml b/playbooks/groups/mbs.yml
index 3140dfc781..0c1d25a9b5 100644
--- a/playbooks/groups/mbs.yml
+++ b/playbooks/groups/mbs.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    myhosts: "mbs:mbs_stg"
 
 - name: make the box be real
   hosts: mbs:mbs_stg
diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml
index 5eff783641..98d39af727 100644
--- a/playbooks/groups/memcached.yml
+++ b/playbooks/groups/memcached.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    myhosts: "memcached:memcached_stg"
 
 - name: make the box be real
   hosts: memcached:memcached_stg
diff --git a/playbooks/groups/mirrormanager.yml b/playbooks/groups/mirrormanager.yml
index b87744b671..1ea7e85eed 100644
--- a/playbooks/groups/mirrormanager.yml
+++ b/playbooks/groups/mirrormanager.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    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 2fcbcaac6a..6f9cd1a2cf 100644
--- a/playbooks/groups/noc.yml
+++ b/playbooks/groups/noc.yml
@@ -1,5 +1,7 @@
 # This is a basic playbook
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "nagios"
 
 - name: make the box be real
   hosts: nagios
diff --git a/playbooks/groups/nuancier.yml b/playbooks/groups/nuancier.yml
index 42adcb854d..add786c8f8 100644
--- a/playbooks/groups/nuancier.yml
+++ b/playbooks/groups/nuancier.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_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"
+  vars:
+    myhosts: "nuancier:nuancier_stg"
 
 - name: make the box be real
   hosts: nuancier:nuancier_stg
diff --git a/playbooks/groups/oci-registry.yml b/playbooks/groups/oci-registry.yml
index 5ca0574398..bb9e43e93b 100644
--- a/playbooks/groups/oci-registry.yml
+++ b/playbooks/groups/oci-registry.yml
@@ -1,5 +1,7 @@
 # create an osbs server
-- import_playbook:  "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=oci_registry:oci_registry_stg"
+- import_playbook:  "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "oci_registry:oci_registry_stg"
 
 - name: make the box be real
   hosts: oci_registry:oci_registry_stg
diff --git a/playbooks/groups/odcs.yml b/playbooks/groups/odcs.yml
index d5f4840556..8de2b1bbaa 100644
--- a/playbooks/groups/odcs.yml
+++ b/playbooks/groups/odcs.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    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 7064f2b059..c844df1571 100644
--- a/playbooks/groups/openqa.yml
+++ b/playbooks/groups/openqa.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=openqa:openqa_lab"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "openqa:openqa_lab"
 
 - name: setup base openQA host
   hosts: openqa:openqa_lab
diff --git a/playbooks/groups/os-proxies.yml b/playbooks/groups/os-proxies.yml
index 7c6f868eee..ad9370efbb 100644
--- a/playbooks/groups/os-proxies.yml
+++ b/playbooks/groups/os-proxies.yml
@@ -1,6 +1,8 @@
 # create a new proxy server
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=os_proxies"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "os_proxies"
 
 - name: make the box be real
   hosts: os_proxies
diff --git a/playbooks/groups/pagure.yml b/playbooks/groups/pagure.yml
index de692756ee..63907faac6 100644
--- a/playbooks/groups/pagure.yml
+++ b/playbooks/groups/pagure.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    myhosts: "pagure:pagure_stg"
 
 - name: make the boxen be real for real
   hosts: pagure:pagure_stg
diff --git a/playbooks/groups/pdc.yml b/playbooks/groups/pdc.yml
index 5a5cb54bb9..467530a823 100644
--- a/playbooks/groups/pdc.yml
+++ b/playbooks/groups/pdc.yml
@@ -1,6 +1,8 @@
 # PDC servers (both frontend and backend)
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pdc_web:pdc_web_stg"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "pdc_web:pdc_web_stg"
 
 - name: dole out the generic configuration
   hosts: pdc_web:pdc_web_stg
diff --git a/playbooks/groups/people.yml b/playbooks/groups/people.yml
index c63734793e..e0c5a44411 100644
--- a/playbooks/groups/people.yml
+++ b/playbooks/groups/people.yml
@@ -1,7 +1,9 @@
 # Create a people server
 #
 #
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=people"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "people"
 
 - name: make the box be real
   hosts: people
diff --git a/playbooks/groups/pkgs.yml b/playbooks/groups/pkgs.yml
index 0ec71c0a29..931165ec6e 100644
--- a/playbooks/groups/pkgs.yml
+++ b/playbooks/groups/pkgs.yml
@@ -1,5 +1,7 @@
 ---
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs_stg:pkgs"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "pkgs_stg:pkgs"
 
 - name: make the box be real
   hosts: pkgs_stg:pkgs
diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml
index cf94244be7..285c819bae 100644
--- a/playbooks/groups/postgresql-server.yml
+++ b/playbooks/groups/postgresql-server.yml
@@ -2,7 +2,9 @@
 # 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
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org:db-datanommer01.stg.iad2.fedoraproject.org:db-datanommer02.iad2.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "db-fas01.stg.iad2.fedoraproject.org:db01.stg.iad2.fedoraproject.org:db-koji01.stg.iad2.fedoraproject.org:db-fas01.iad2.fedoraproject.org:db01.iad2.fedoraproject.org:db-datanommer01.iad2.fedoraproject.org:db-koji01.iad2.fedoraproject.org:db-openqa01.iad2.fedoraproject.org:db-datanommer01.stg.iad2.fedoraproject.org:db-datanommer02.iad2.fedoraproject.org"
 
 # Once the instance exists, configure it.
 
diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml
index 33a0fb1bc0..a0d78e8b59 100644
--- a/playbooks/groups/proxies.yml
+++ b/playbooks/groups/proxies.yml
@@ -1,6 +1,8 @@
 # create a new proxy server
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies_stg:!proxy05.fedoraproject.org:!cloud_aws"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "proxies:proxies_stg:!proxy05.fedoraproject.org:!cloud_aws"
 
 - name: make the box be real
   hosts: proxies_stg:proxies
diff --git a/playbooks/groups/rabbitmq.yml b/playbooks/groups/rabbitmq.yml
index 94950e2260..29ac6f087c 100644
--- a/playbooks/groups/rabbitmq.yml
+++ b/playbooks/groups/rabbitmq.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=rabbitmq:rabbitmq_stg"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "rabbitmq:rabbitmq_stg"
 
 - name: make the box be real
   hosts: rabbitmq:rabbitmq_stg
diff --git a/playbooks/groups/releng-compose.yml b/playbooks/groups/releng-compose.yml
index ed9aea3df1..04b68aba4f 100644
--- a/playbooks/groups/releng-compose.yml
+++ b/playbooks/groups/releng-compose.yml
@@ -3,7 +3,9 @@
 # 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
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=releng_compose:releng_compose_stg"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "releng_compose:releng_compose_stg"
 
 - name: Setup releng compose hosts
   hosts: releng_compose:releng_compose_stg
diff --git a/playbooks/groups/secondary.yml b/playbooks/groups/secondary.yml
index 5b437e5019..ecad78b21a 100644
--- a/playbooks/groups/secondary.yml
+++ b/playbooks/groups/secondary.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=secondary"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    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 e5dc00be51..459423ea54 100644
--- a/playbooks/groups/sign-bridge.yml
+++ b/playbooks/groups/sign-bridge.yml
@@ -6,7 +6,9 @@
 # Access is via management interface only. This playbook does initial setup.
 # Please check with rel-eng before doing anything here.
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=sign_bridge"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    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 163787fc5a..be2b11f638 100644
--- a/playbooks/groups/smtp-mm.yml
+++ b/playbooks/groups/smtp-mm.yml
@@ -1,6 +1,8 @@
 # create smtp servers
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=smtp_mm"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "smtp_mm"
 
 - name: make the box be real
   hosts: smtp_mm
diff --git a/playbooks/groups/sundries.yml b/playbooks/groups/sundries.yml
index df581959d0..8bc2c11ff7 100644
--- a/playbooks/groups/sundries.yml
+++ b/playbooks/groups/sundries.yml
@@ -3,7 +3,9 @@
 # These servers run a number of smaller apps that don't merit their own instances.
 #
 
-- import_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"
+  vars:
+    myhosts: "sundries:sundries_stg"
 
 - name: make the box be real
   hosts: sundries:sundries_stg
diff --git a/playbooks/groups/tang.yml b/playbooks/groups/tang.yml
index 61a11abcff..aaef2709a1 100644
--- a/playbooks/groups/tang.yml
+++ b/playbooks/groups/tang.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=tang"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "tang"
 
 - name: make the box be real
   hosts: tang
diff --git a/playbooks/groups/torrent.yml b/playbooks/groups/torrent.yml
index a2c2ee412a..fe80387fb9 100644
--- a/playbooks/groups/torrent.yml
+++ b/playbooks/groups/torrent.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=torrent"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "torrent"
 
 - name: make the box be real
   hosts: torrent
diff --git a/playbooks/groups/unbound.yml b/playbooks/groups/unbound.yml
index 8501ed7580..0b0f7c16fa 100644
--- a/playbooks/groups/unbound.yml
+++ b/playbooks/groups/unbound.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=unbound"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "unbound"
 
 - name: make the box be real
   hosts: unbound
diff --git a/playbooks/groups/value.yml b/playbooks/groups/value.yml
index 1a13bad467..3b824d3356 100644
--- a/playbooks/groups/value.yml
+++ b/playbooks/groups/value.yml
@@ -1,4 +1,6 @@
-- import_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"
+  vars:
+    myhosts: "value:value_stg"
 
 - name: make the box be real
   hosts: value:value_stg
diff --git a/playbooks/groups/virthost.yml b/playbooks/groups/virthost.yml
index 28937a5fb8..635957b517 100644
--- a/playbooks/groups/virthost.yml
+++ b/playbooks/groups/virthost.yml
@@ -2,7 +2,9 @@
 # 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
 
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml myhosts=virthost:bvirthost:buildvmhost:virthost_comm:colo_virt:virthost_communishift:!buildvmhost-s390x-01.s390.fedoraproject.org"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/happy_birthday.yml"
+  vars:
+    myhosts: "virthost:bvirthost:buildvmhost:virthost_comm:colo_virt:virthost_communishift:!buildvmhost-s390x-01.s390.fedoraproject.org"
 
 - name: make virthost server system
   hosts: virthost:bvirthost:buildvmhost:virthost_comm:colo_virt:virthost_communishift
diff --git a/playbooks/groups/wiki.yml b/playbooks/groups/wiki.yml
index 605803ef7d..cbea542404 100644
--- a/playbooks/groups/wiki.yml
+++ b/playbooks/groups/wiki.yml
@@ -3,7 +3,9 @@
 # These servers run mediawiki for the main fedora wiki instance.
 #
 
-- import_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"
+  vars:
+    myhosts: "wiki:wiki_stg"
 
 - name: make the box be real
   hosts: wiki:wiki_stg
diff --git a/playbooks/groups/zabbix.yml b/playbooks/groups/zabbix.yml
index e2bfe885e1..e209667873 100644
--- a/playbooks/groups/zabbix.yml
+++ b/playbooks/groups/zabbix.yml
@@ -1,4 +1,6 @@
-- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=zabbix_stg"
+- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml"
+  vars:
+    myhosts: "zabbix_stg"
 
 - name: make the box be real
   hosts: zabbix_stg