commit 60c1aee6690b0124e495b46250904c201b1f4a37 Author: Nicolas Chauvet <kwizart(a)gmail.com&gt; Date: Tue Feb 6 12:07:36 2018 +0100 Fix import_playbook playbooks/check-host.yml | 2 +- playbooks/groups/autosign.yml | 2 +- playbooks/groups/bastion.yml | 2 +- playbooks/groups/batcave.yml | 2 +- playbooks/groups/bodhi-backend.yml | 2 +- playbooks/groups/bodhi2.yml | 2 +- playbooks/groups/bugzilla.yml | 2 +- playbooks/groups/buildvm.yml | 2 +- playbooks/groups/darkserver-backend.yml | 2 +- playbooks/groups/darkserver-web.yml | 2 +- playbooks/groups/dhcp.yml | 2 +- playbooks/groups/dns.yml | 2 +- playbooks/groups/fas.yml | 2 +- playbooks/groups/github2fedmsg.yml | 2 +- playbooks/groups/ipsilon.yml | 2 +- playbooks/groups/koji-hub.yml | 2 +- playbooks/groups/kojipkgs.yml | 2 +- playbooks/groups/logserver.yml | 2 +- playbooks/groups/mailman.yml | 2 +- playbooks/groups/mariadb-server.yml | 2 +- playbooks/groups/memcached.yml | 2 +- playbooks/groups/mirrorlist2.yml | 2 +- playbooks/groups/mirrormanager.yml | 2 +- playbooks/groups/moin.yml | 2 +- playbooks/groups/noc.yml | 2 +- playbooks/groups/notifs-backend.yml | 2 +- playbooks/groups/notifs-web.yml | 2 +- playbooks/groups/osbs-master.yml | 4 ++-- playbooks/groups/packages.yml | 2 +- playbooks/groups/pkgdb.yml | 2 +- playbooks/groups/pkgs.yml | 14 +++++++------- playbooks/groups/postgresql-server.yml | 2 +- playbooks/groups/proxies.yml | 18 +++++++++--------- playbooks/groups/sign-bridge.yml | 2 +- playbooks/groups/smtp-mm.yml | 2 +- playbooks/vhost_reboot.yml | 4 ++-- playbooks/vhost_update.yml | 2 +- 37 files changed, 53 insertions(+), 53 deletions(-) --- diff --git a/playbooks/check-host.yml b/playbooks/check-host.yml index 52e30d9..7daace9 100644 --- a/playbooks/check-host.yml +++ b/playbooks/check-host.yml @@ -266,4 +266,4 @@ # handlers: # - import_tasks: "{{ handlers_path }}/restart_services.yml" -# - include: "restart_services.yml" +# - import_playbook: "restart_services.yml" diff --git a/playbooks/groups/autosign.yml b/playbooks/groups/autosign.yml index 369ab22..74e1129 100644 --- a/playbooks/groups/autosign.yml +++ b/playbooks/groups/autosign.yml @@ -2,7 +2,7 @@ # # This server looks for rawhide builds and requests they be signed. # -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=autosign" - name: make the box be real hosts: autosign:autosign-hardware diff --git a/playbooks/groups/bastion.yml b/playbooks/groups/bastion.yml index d8990bf..c7316e7 100644 --- a/playbooks/groups/bastion.yml +++ b/playbooks/groups/bastion.yml @@ -1,4 +1,4 @@ -#- include: "/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 19a5667..8907bef 100644 --- a/playbooks/groups/batcave.yml +++ b/playbooks/groups/batcave.yml @@ -1,4 +1,4 @@ -- include: "/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/bodhi-backend.yml b/playbooks/groups/bodhi-backend.yml index d60f613..a8ce720 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: "/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 71af460..bb98402 100644 --- a/playbooks/groups/bodhi2.yml +++ b/playbooks/groups/bodhi2.yml @@ -1,4 +1,4 @@ -- include: "/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/bugzilla.yml b/playbooks/groups/bugzilla.yml index 63cf3ec..35aa3a6 100644 --- a/playbooks/groups/bugzilla.yml +++ b/playbooks/groups/bugzilla.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/bugzilla* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla:bugzilla-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=bugzilla:bugzilla-stg" - name: make the box be real hosts: bugzilla-stg:bugzilla diff --git a/playbooks/groups/buildvm.yml b/playbooks/groups/buildvm.yml index 3cd5027..887cb0d 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: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=buildvm:buildvm-stg" - name: make koji builder(s) hosts: buildvm:buildvm-stg:buildvm-ppc64:buildvm-ppc64le:buildppcle:buildppc:buildvm-s390 diff --git a/playbooks/groups/darkserver-backend.yml b/playbooks/groups/darkserver-backend.yml index 2c64953..24c819c 100644 --- a/playbooks/groups/darkserver-backend.yml +++ b/playbooks/groups/darkserver-backend.yml @@ -1,4 +1,4 @@ -- include: "/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 a8ab841..310db35 100644 --- a/playbooks/groups/darkserver-web.yml +++ b/playbooks/groups/darkserver-web.yml @@ -1,4 +1,4 @@ -- include: "/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/dhcp.yml b/playbooks/groups/dhcp.yml index 23c041d..0978ebe 100644 --- a/playbooks/groups/dhcp.yml +++ b/playbooks/groups/dhcp.yml @@ -1,4 +1,4 @@ -- include: "/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 6c0ef4b..9c3e1e3 100644 --- a/playbooks/groups/dns.yml +++ b/playbooks/groups/dns.yml @@ -1,6 +1,6 @@ # create a new dns server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=dns" when: vmhost is defined - name: make the box be real diff --git a/playbooks/groups/fas.yml b/playbooks/groups/fas.yml index fb9a9b6..b766734 100644 --- a/playbooks/groups/fas.yml +++ b/playbooks/groups/fas.yml @@ -1,6 +1,6 @@ # create a new fas server -- include: "/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/github2fedmsg.yml b/playbooks/groups/github2fedmsg.yml index 7b5abf3..381f3f0 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: "/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/ipsilon.yml b/playbooks/groups/ipsilon.yml index d2aa2dd..8be115d 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: "/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/koji-hub.yml b/playbooks/groups/koji-hub.yml index 8242a9f..1f4c6a6 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: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji01.rpmfusion.org:koji02.rpmfusion.org:s390-koji01.qa.rpmfusion.org:arm-koji01.qa.rpmfusion.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=koji-stg:koji01.rpmfusion.org:koji02.rpmfusion.org:s390-koji01.qa.rpmfusion.org:arm-koji01.qa.rpmfusion.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/kojipkgs.yml b/playbooks/groups/kojipkgs.yml index c17eb3a..4b53cf8 100644 --- a/playbooks/groups/kojipkgs.yml +++ b/playbooks/groups/kojipkgs.yml @@ -1,4 +1,4 @@ -- include: "/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/logserver.yml b/playbooks/groups/logserver.yml index 16320a8..8b2c305 100644 --- a/playbooks/groups/logserver.yml +++ b/playbooks/groups/logserver.yml @@ -1,4 +1,4 @@ -#- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=log01.rpmfusion.org" +#- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=log01.rpmfusion.org" - name: make the box be real hosts: hv01.online.rpmfusion.org diff --git a/playbooks/groups/mailman.yml b/playbooks/groups/mailman.yml index f4ecca1..e978061 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: "/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 fb92a99..34d987a 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: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.rpmfusion.org:db03.stg.rpmfusion.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db03.rpmfusion.org:db03.stg.rpmfusion.org" # Once the instance exists, configure it. diff --git a/playbooks/groups/memcached.yml b/playbooks/groups/memcached.yml index 27cc2a0..436889e 100644 --- a/playbooks/groups/memcached.yml +++ b/playbooks/groups/memcached.yml @@ -1,4 +1,4 @@ -- include: "/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 1c74d22..8777629 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: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=mirrorlist2:mirrorlist2-stg" +#- import_playbook: "/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 130814f..f75a065 100644 --- a/playbooks/groups/mirrormanager.yml +++ b/playbooks/groups/mirrormanager.yml @@ -1,4 +1,4 @@ -- include: "/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/moin.yml b/playbooks/groups/moin.yml index 127cb0e..a6439ea 100644 --- a/playbooks/groups/moin.yml +++ b/playbooks/groups/moin.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/moin* or from hostvars -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=moin:moin-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=moin:moin-stg" - name: make the box be real hosts: moin-stg:moin diff --git a/playbooks/groups/noc.yml b/playbooks/groups/noc.yml index 8ccee02..0a53f82 100644 --- a/playbooks/groups/noc.yml +++ b/playbooks/groups/noc.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios:nagios-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=nagios:nagios-stg" - name: make the box be real hosts: nagios:nagios-stg diff --git a/playbooks/groups/notifs-backend.yml b/playbooks/groups/notifs-backend.yml index 5c2f79e..b2852f4 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: "/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 501df8c..fa19d6c 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: "/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/osbs-master.yml b/playbooks/groups/osbs-master.yml index 08bf760..625911e 100644 --- a/playbooks/groups/osbs-master.yml +++ b/playbooks/groups/osbs-master.yml @@ -1,5 +1,5 @@ # create an osbs server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs:osbs-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=osbs:osbs-stg" - name: make the box be real hosts: osbs:osbs-stg @@ -38,7 +38,7 @@ - /srv/web/infra/ansible/vars/{{ ansible_distribution }}.yml tasks: - - include: "{{tasks}}/osbs_repos.yml" + - import_playbook: "{{tasks}}/osbs_repos.yml" - name: copy docker-storage-setup config copy: diff --git a/playbooks/groups/packages.yml b/playbooks/groups/packages.yml index 063faa2..f709d65 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: "/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/pkgdb.yml b/playbooks/groups/pkgdb.yml index dacd742..1b1f264 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: "/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 e7cb856..306c438 100644 --- a/playbooks/groups/pkgs.yml +++ b/playbooks/groups/pkgs.yml @@ -1,4 +1,4 @@ -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.rpmfusion.org" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=pkgs-stg:pkgs02.rpmfusion.org" - name: make the box be real hosts: pkgs-stg:pkgs01.online.rpmfusion.net @@ -40,12 +40,12 @@ - import_tasks: "{{ handlers_path }}/restart_services.yml" # setup minimal proxy includes -- include: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-websites.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-reverseproxy.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-rewrites.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-redirects.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-fedora-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-websites.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-reverseproxy.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-rewrites.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-redirects.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-fedora-web.yml - name: setup fedmsg on pkgs hosts: pkgs-stg:pkgs01.online.rpmfusion.net diff --git a/playbooks/groups/postgresql-server.yml b/playbooks/groups/postgresql-server.yml index e72417a..db4c57c 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: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db02.online.rpmfusion.net" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=db02.online.rpmfusion.net" # Once the instance exists, configure it. diff --git a/playbooks/groups/proxies.yml b/playbooks/groups/proxies.yml index 15bc709..2d3171b 100644 --- a/playbooks/groups/proxies.yml +++ b/playbooks/groups/proxies.yml @@ -1,6 +1,6 @@ # create a new proxy server -- include: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg" +- import_playbook: "/srv/web/infra/ansible/playbooks/include/virt-create.yml myhosts=proxies:proxies-stg" - name: make the box be real hosts: proxies-stg:proxies @@ -115,14 +115,14 @@ # out the proxy-specific configuration into a couple different sub-playbooks. # Othewise, this file would be unbearably long. -- include: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-websites.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-reverseproxy.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-rewrites.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-redirects.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-fedora-web.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-haproxy.yml -- include: /srv/web/infra/ansible/playbooks/include/proxies-miscellaneous.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-certificates.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-websites.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-reverseproxy.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-rewrites.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-redirects.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-fedora-web.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-haproxy.yml +- import_playbook: /srv/web/infra/ansible/playbooks/include/proxies-miscellaneous.yml - name: Make sure we are deployed fully hosts: proxies-stg:proxies diff --git a/playbooks/groups/sign-bridge.yml b/playbooks/groups/sign-bridge.yml index 56191dc..df7a97d 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: "/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 9933e95..740dd65 100644 --- a/playbooks/groups/smtp-mm.yml +++ b/playbooks/groups/smtp-mm.yml @@ -1,6 +1,6 @@ # create smtp servers -- include: "/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/vhost_reboot.yml b/playbooks/vhost_reboot.yml index d66a6c7..ea0b50f 100644 --- a/playbooks/vhost_reboot.yml +++ b/playbooks/vhost_reboot.yml @@ -34,7 +34,7 @@ with_items: vmlist.list_vms # Call out to another playbook. Disable any proxies that may live here -- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies +- import_playbook: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies when: nodns is not defined or not nodns - name: halt instances @@ -103,7 +103,7 @@ when: nonagios is not defined or not nonagios # Call out to that dns playbook. Put proxies back in now that they're back -- include: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies +- import_playbook: update-proxy-dns.yml status=enable proxies=myvms_new:&proxies when: nodns is not defined or not nodns - name: Fix unbound if necessary diff --git a/playbooks/vhost_update.yml b/playbooks/vhost_update.yml index 949ed74..9c82ab3 100644 --- a/playbooks/vhost_update.yml +++ b/playbooks/vhost_update.yml @@ -19,7 +19,7 @@ with_items: vmlist.list_vms # Call out to another playbook. Disable any proxies that may live here -#- include: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies +#- import_playbook: update-proxy-dns.yml status=disable proxies=myvms_new:&proxies - name: update the system hosts: "{{ target }}:myvms_new"