commit 2a9a8158571bdbdc86b8a82f4b31a51f31e8c87f Author: Sorin Sbarnea Date: Thu Oct 8 16:32:28 2020 +0100 Replace ansible include with import_playbook Make use of import_playbook instead of deprecated and misleading include. Change-Id: I20c67191be4394c33184620928e31a2ee15956fa diff --git a/playbooks/baremetal-quickstart-extras.yml b/playbooks/baremetal-quickstart-extras.yml index 1925376..eb69eb0 100644 --- a/playbooks/baremetal-quickstart-extras.yml +++ b/playbooks/baremetal-quickstart-extras.yml @@ -1,5 +1,5 @@ --- -- include: baremetal-full-undercloud.yml -- include: baremetal-full-overcloud-prep.yml -- include: baremetal-full-overcloud.yml -- include: baremetal-full-overcloud-validate.yml +- import_playbook: baremetal-full-undercloud.yml +- import_playbook: baremetal-full-overcloud-prep.yml +- import_playbook: baremetal-full-overcloud.yml +- import_playbook: baremetal-full-overcloud-validate.yml diff --git a/playbooks/deploy-delete.yml b/playbooks/deploy-delete.yml index 9471675..8466ea4 100644 --- a/playbooks/deploy-delete.yml +++ b/playbooks/deploy-delete.yml @@ -1,7 +1,7 @@ --- # This is the playbook used by the `quickstart.sh` script. -- include: quickstart-extras.yml +- import_playbook: quickstart-extras.yml - name: Collect logs, create docs, publish hosts: all:!localhost diff --git a/playbooks/multinode-minion.yml b/playbooks/multinode-minion.yml index 4e38acb..5df3c43 100644 --- a/playbooks/multinode-minion.yml +++ b/playbooks/multinode-minion.yml @@ -1,4 +1,4 @@ --- -- include: quickstart.yml -- include: multinode-undercloud.yml -- include: multinode-undercloud-minion.yml +- import_playbook: quickstart.yml +- import_playbook: multinode-undercloud.yml +- import_playbook: multinode-undercloud-minion.yml diff --git a/playbooks/multinode.yml b/playbooks/multinode.yml index 9d18727..8186c83 100644 --- a/playbooks/multinode.yml +++ b/playbooks/multinode.yml @@ -1,8 +1,8 @@ --- -- include: quickstart.yml -- include: multinode-undercloud.yml -- include: multinode-overcloud-prep.yml -- include: multinode-overcloud.yml -- include: multinode-overcloud-update.yml -- include: multinode-overcloud-upgrade.yml -- include: multinode-validate.yml +- import_playbook: quickstart.yml +- import_playbook: multinode-undercloud.yml +- import_playbook: multinode-overcloud-prep.yml +- import_playbook: multinode-overcloud.yml +- import_playbook: multinode-overcloud-update.yml +- import_playbook: multinode-overcloud-upgrade.yml +- import_playbook: multinode-validate.yml diff --git a/playbooks/quickstart-extras.yml b/playbooks/quickstart-extras.yml index 3b14570..49c0e7c 100644 --- a/playbooks/quickstart-extras.yml +++ b/playbooks/quickstart-extras.yml @@ -1,8 +1,8 @@ --- # This is the playbook used by the `quickstart.sh` script. -- include: quickstart.yml -- include: quickstart-extras-undercloud.yml -- include: quickstart-extras-overcloud-prep.yml -- include: quickstart-extras-overcloud.yml -- include: quickstart-extras-validate.yml +- import_playbook: quickstart.yml +- import_playbook: quickstart-extras-undercloud.yml +- import_playbook: quickstart-extras-overcloud-prep.yml +- import_playbook: quickstart-extras-overcloud.yml +- import_playbook: quickstart-extras-validate.yml diff --git a/playbooks/scale_nodes.yml b/playbooks/scale_nodes.yml index 9b05f3a..88113b4 100644 --- a/playbooks/scale_nodes.yml +++ b/playbooks/scale_nodes.yml @@ -5,7 +5,7 @@ ################ # From tripleo-quickstart/playbooks -- include: quickstart-extras.yml +- import_playbook: quickstart-extras.yml ############### # Scale Nodes #