From d98fb7944649a4e07bbb8033f8590866d2b08523 Mon Sep 17 00:00:00 2001 From: Yasufumi Ogawa Date: Mon, 5 Aug 2024 09:26:36 +0000 Subject: [PATCH] Fix deprecated include module In the recent version of ansible-playbook, it's failed because `include` module is deprecated and suggests to use `include_tasks` or `import_tasks` instead. This update is to fix the issue. Change-Id: Iedd8138fea17905b951602646e5d1bff8494acea Signed-off-by: Yasufumi Ogawa --- .../centos-stream8/compute/tasks/main.yml | 4 ++-- .../centos-stream8/controller/tasks/main.yml | 20 ++++++++--------- .../roles/ubuntu-jammy/compute/tasks/main.yml | 4 ++-- .../ubuntu-jammy/controller/tasks/main.yml | 22 +++++++++---------- 4 files changed, 25 insertions(+), 25 deletions(-) diff --git a/vagrant/devstack/roles/centos-stream8/compute/tasks/main.yml b/vagrant/devstack/roles/centos-stream8/compute/tasks/main.yml index 7efaf8b22..2f1311d22 100644 --- a/vagrant/devstack/roles/centos-stream8/compute/tasks/main.yml +++ b/vagrant/devstack/roles/centos-stream8/compute/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: basic_pkgs.yml +- include_tasks: basic_pkgs.yml tags: basic_pkgs -- include: devstack.yml +- include_tasks: devstack.yml tags: devstack diff --git a/vagrant/devstack/roles/centos-stream8/controller/tasks/main.yml b/vagrant/devstack/roles/centos-stream8/controller/tasks/main.yml index f7c366e53..e112797aa 100644 --- a/vagrant/devstack/roles/centos-stream8/controller/tasks/main.yml +++ b/vagrant/devstack/roles/centos-stream8/controller/tasks/main.yml @@ -1,21 +1,21 @@ --- -- include: basic_pkgs.yml -- include: set_path_env.yml -- include: git_config.yml +- include_tasks: basic_pkgs.yml +- include_tasks: set_path_env.yml +- include_tasks: git_config.yml -- include: python3_specific_vers.yml +- include_tasks: python3_specific_vers.yml -- include: vim_extra_plugins.yml +- include_tasks: vim_extra_plugins.yml when: use_vim_extra_plugins == true -- include: kubernetes.yml +- include_tasks: kubernetes.yml -- include: ovn.yml +- include_tasks: ovn.yml -- include: devstack.yml +- include_tasks: devstack.yml -- include: setup_tacker.yml +- include_tasks: setup_tacker.yml when: use_tacker == true -- include: extra_tools.yml +- include_tasks: extra_tools.yml when: use_extra_tools == true diff --git a/vagrant/devstack/roles/ubuntu-jammy/compute/tasks/main.yml b/vagrant/devstack/roles/ubuntu-jammy/compute/tasks/main.yml index 7efaf8b22..2f1311d22 100644 --- a/vagrant/devstack/roles/ubuntu-jammy/compute/tasks/main.yml +++ b/vagrant/devstack/roles/ubuntu-jammy/compute/tasks/main.yml @@ -1,6 +1,6 @@ --- -- include: basic_pkgs.yml +- include_tasks: basic_pkgs.yml tags: basic_pkgs -- include: devstack.yml +- include_tasks: devstack.yml tags: devstack diff --git a/vagrant/devstack/roles/ubuntu-jammy/controller/tasks/main.yml b/vagrant/devstack/roles/ubuntu-jammy/controller/tasks/main.yml index ee0a5c659..78bd164d2 100644 --- a/vagrant/devstack/roles/ubuntu-jammy/controller/tasks/main.yml +++ b/vagrant/devstack/roles/ubuntu-jammy/controller/tasks/main.yml @@ -1,26 +1,26 @@ --- # Without removing this package, failed to install while running scripts. -- include: remove_useless_pkgs.yml +- include_tasks: remove_useless_pkgs.yml -- include: basic_pkgs.yml -- include: set_path_env.yml -- include: git_config.yml +- include_tasks: basic_pkgs.yml +- include_tasks: set_path_env.yml +- include_tasks: git_config.yml -- include: python3_specific_vers.yml +- include_tasks: python3_specific_vers.yml -- include: vim_latest.yml +- include_tasks: vim_latest.yml when: use_vim_latest == true -- include: vim_extra_plugins.yml +- include_tasks: vim_extra_plugins.yml when: use_vim_extra_plugins == true -- include: neovim.yml +- include_tasks: neovim.yml when: use_neovim == true -- include: devstack.yml +- include_tasks: devstack.yml -- include: setup_tacker.yml +- include_tasks: setup_tacker.yml when: use_tacker == true -- include: extra_tools.yml +- include_tasks: extra_tools.yml when: use_extra_tools == true