From 258bae87c39d9e9c612ad0c8e56936ba5aeb2bb7 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 19 Aug 2018 10:58:28 -0400 Subject: [PATCH] use include_tasks instead of include include is marked as deprecated since ansible 2.4[0] Switch to include_tasks or import_playbook as necessary [0] https://docs.ansible.com/ansible/2.4/include_module.html#deprecated Change-Id: Id2bf058a0b3bceb216861ef21ffa3fcf7a46d32e --- tests/benchmark-upgrade.yml | 6 +++--- tests/test-install-previous-swift.yml | 2 +- tests/test-upgrade.yml | 8 ++++---- tests/test.yml | 8 ++++---- 4 files changed, 12 insertions(+), 12 deletions(-) diff --git a/tests/benchmark-upgrade.yml b/tests/benchmark-upgrade.yml index 8bf01d88..c888000b 100644 --- a/tests/benchmark-upgrade.yml +++ b/tests/benchmark-upgrade.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: test-swift-resources-upgrade.yml +- import_playbook: test-swift-resources-upgrade.yml -- include: common/test-install-swift.yml +- import_playbook: common/test-install-swift.yml -- include: test-swift-resources-results.yml +- import_playbook: test-swift-resources-results.yml diff --git a/tests/test-install-previous-swift.yml b/tests/test-install-previous-swift.yml index 534a87f2..6e85d4d6 100644 --- a/tests/test-install-previous-swift.yml +++ b/tests/test-install-previous-swift.yml @@ -14,7 +14,7 @@ # limitations under the License. # Ensure the repo is setup for previous version -- include: common/previous/test-repo-setup.yml +- import_playbook: common/previous/test-repo-setup.yml - name: Playbook for deploying swift hosts: "{{ swift_groups | default('swift_all:swift_remote_all') }}" diff --git a/tests/test-upgrade.yml b/tests/test-upgrade.yml index ae0fabf2..32179a9b 100644 --- a/tests/test-upgrade.yml +++ b/tests/test-upgrade.yml @@ -14,13 +14,13 @@ # limitations under the License. # Setup the keys, host and containers -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-host.yml # Install Memcached/Galera/Rabbitmq -- include: common/test-install-infra.yml +- import_playbook: common/test-install-infra.yml # Install Keystone -- include: common/test-install-keystone.yml +- import_playbook: common/test-install-keystone.yml # Setup Swift-hosts -- include: common/test-setup-swifthosts.yml +- import_playbook: common/test-setup-swifthosts.yml diff --git a/tests/test.yml b/tests/test.yml index d8f27e38..a6e01d2a 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,13 +14,13 @@ # limitations under the License. # Setup the keys, host and containers -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-host.yml # Install Infrastructure -- include: common/test-install-infra.yml +- import_playbook: common/test-install-infra.yml # Install Keystone -- include: common/test-install-keystone.yml +- import_playbook: common/test-install-keystone.yml # Install Swift -- include: common/test-install-swift.yml +- import_playbook: common/test-install-swift.yml