From 2f5b325565810c267e61459fd87e1a0534a48f85 Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 19 Aug 2018 11:45:07 -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: I0fcc921ab5382d5f5a303be0bb989f135fa5cf9b --- tasks/main.yml | 16 +++++++--------- tasks/rabbitmq_cluster.yml | 3 +-- tasks/rabbitmq_install.yml | 6 +++--- tasks/rabbitmq_post_install.yml | 3 +-- tasks/rabbitmq_restart.yml | 4 ++-- tasks/rabbitmq_set_cookie.yml | 6 ++---- tasks/rabbitmq_ssl_self_signed.yml | 6 +++--- tasks/rabbitmq_upgrade_check.yml | 3 +-- tasks/rabbitmq_upgrade_prep.yml | 2 +- tests/test-upgrade-post.yml | 4 ++-- tests/test-upgrade-pre.yml | 2 +- tests/test.yml | 6 +++--- 12 files changed, 27 insertions(+), 34 deletions(-) diff --git a/tasks/main.yml b/tasks/main.yml index 93e7d51d..e5f3cfaf 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -24,13 +24,12 @@ tags: - always -- include: rabbitmq_pre_install.yml +- include_tasks: rabbitmq_pre_install.yml tags: - rabbitmq_server-install # The install process will be skipped if `rabbitmq_ignore_version_state=true` -- include: rabbitmq_install.yml - static: no +- include_tasks: rabbitmq_install.yml when: not rabbitmq_ignore_version_state | bool # RabbitMQ SSL/TLS listener configuration @@ -43,28 +42,27 @@ # # playbooks/roles/rabbitmq_server/defaults/main.yml # -- include: rabbitmq_ssl_self_signed.yml - static: no +- include_tasks: rabbitmq_ssl_self_signed.yml when: > rabbitmq_user_ssl_cert is not defined or rabbitmq_user_ssl_key is not defined tags: - rabbitmq_server-config -- include: rabbitmq_ssl_user_provided.yml +- include_tasks: rabbitmq_ssl_user_provided.yml tags: - rabbitmq_server-config -- include: rabbitmq_set_cookie.yml +- include_tasks: rabbitmq_set_cookie.yml tags: - rabbitmq_server-config - rabbitmq-config -- include: rabbitmq_post_install.yml +- include_tasks: rabbitmq_post_install.yml tags: - rabbitmq_server-config -- include: rabbitmq_cluster.yml +- include_tasks: rabbitmq_cluster.yml tags: - rabbitmq_server-config - rabbitmq-cluster diff --git a/tasks/rabbitmq_cluster.yml b/tasks/rabbitmq_cluster.yml index 56b178e1..30868288 100644 --- a/tasks/rabbitmq_cluster.yml +++ b/tasks/rabbitmq_cluster.yml @@ -41,8 +41,7 @@ - "_cluster_name.stdout != rabbitmq_cluster_name" - name: Join cluster on secondary nodes - include: rabbitmq_cluster_join.yml - static: no + include_tasks: rabbitmq_cluster_join.yml when: - "ansible_hostname != rabbitmq_primary_cluster_node" - "_cluster_name.stdout != rabbitmq_cluster_name" diff --git a/tasks/rabbitmq_install.yml b/tasks/rabbitmq_install.yml index 341bc682..bc7f260d 100644 --- a/tasks/rabbitmq_install.yml +++ b/tasks/rabbitmq_install.yml @@ -13,9 +13,9 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: rabbitmq_upgrade_check.yml +- include_tasks: rabbitmq_upgrade_check.yml -- include: "install_{{ ansible_pkg_mgr }}.yml" +- include_tasks: "install_{{ ansible_pkg_mgr }}.yml" tags: - rabbitmq-apt-packages - rabbitmq-yum-packages @@ -41,6 +41,6 @@ - rabbitmq-policy-file - rabbitmq_server-config -- include: rabbitmq_started.yml +- include_tasks: rabbitmq_started.yml tags: - rabbitmq_server-config diff --git a/tasks/rabbitmq_post_install.yml b/tasks/rabbitmq_post_install.yml index 5588016e..c57d131a 100644 --- a/tasks/rabbitmq_post_install.yml +++ b/tasks/rabbitmq_post_install.yml @@ -84,8 +84,7 @@ - rabbitmq-config - rabbitmq-cluster -- include: rabbitmq_restart.yml - static: no +- include_tasks: rabbitmq_restart.yml when: rabbit_config is changed or rabbitmq_plugin is changed or rabbitmq_policy is changed # This is being done because the rabbitctl command used by the module diff --git a/tasks/rabbitmq_restart.yml b/tasks/rabbitmq_restart.yml index aec2cea3..292da67b 100644 --- a/tasks/rabbitmq_restart.yml +++ b/tasks/rabbitmq_restart.yml @@ -13,5 +13,5 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: rabbitmq_stopped.yml -- include: rabbitmq_started.yml +- include_tasks: rabbitmq_stopped.yml +- include_tasks: rabbitmq_started.yml diff --git a/tasks/rabbitmq_set_cookie.yml b/tasks/rabbitmq_set_cookie.yml index b0d2d162..0778fe7c 100644 --- a/tasks/rabbitmq_set_cookie.yml +++ b/tasks/rabbitmq_set_cookie.yml @@ -22,13 +22,11 @@ group: rabbitmq register: cookie_set -- include: rabbitmq_stopped.yml - static: no +- include_tasks: rabbitmq_stopped.yml when: - cookie_set is changed -- include: rabbitmq_started.yml - static: no +- include_tasks: rabbitmq_started.yml when: - cookie_set is changed diff --git a/tasks/rabbitmq_ssl_self_signed.yml b/tasks/rabbitmq_ssl_self_signed.yml index 3ec83537..4a1347f1 100644 --- a/tasks/rabbitmq_ssl_self_signed.yml +++ b/tasks/rabbitmq_ssl_self_signed.yml @@ -15,11 +15,11 @@ # We create the self-signed SSL certificate and key only on the first # RabbitMQ container. -- include: rabbitmq_ssl_key_create.yml +- include_tasks: rabbitmq_ssl_key_create.yml when: inventory_hostname == groups[rabbitmq_host_group][0] -- include: rabbitmq_ssl_key_store.yml +- include_tasks: rabbitmq_ssl_key_store.yml when: inventory_hostname == groups[rabbitmq_host_group][0] -- include: rabbitmq_ssl_key_distribute.yml +- include_tasks: rabbitmq_ssl_key_distribute.yml when: inventory_hostname != groups[rabbitmq_host_group][0] diff --git a/tasks/rabbitmq_upgrade_check.yml b/tasks/rabbitmq_upgrade_check.yml index 8d38507f..74b4d2ba 100644 --- a/tasks/rabbitmq_upgrade_check.yml +++ b/tasks/rabbitmq_upgrade_check.yml @@ -68,6 +68,5 @@ - rabbitmq-package-rpm - rabbitmq-apt-packages -- include: rabbitmq_upgrade_prep.yml - static: no +- include_tasks: rabbitmq_upgrade_prep.yml when: rabbitmq_upgrade | bool diff --git a/tasks/rabbitmq_upgrade_prep.yml b/tasks/rabbitmq_upgrade_prep.yml index e77e1609..cc983fbd 100644 --- a/tasks/rabbitmq_upgrade_prep.yml +++ b/tasks/rabbitmq_upgrade_prep.yml @@ -23,7 +23,7 @@ - rabbitmq-policy-file - rabbitmq-upgrade -- include: rabbitmq_stopped.yml +- include_tasks: rabbitmq_stopped.yml - name: Ensure erlang epmd is stopped shell: | diff --git a/tests/test-upgrade-post.yml b/tests/test-upgrade-post.yml index e1da2cad..f8d7f77e 100644 --- a/tests/test-upgrade-post.yml +++ b/tests/test-upgrade-post.yml @@ -14,7 +14,7 @@ # limitations under the License. # Install RabbitMQ server -- include: common/test-install-rabbitmq.yml +- import_playbook: common/test-install-rabbitmq.yml # Run functional tests -- include: test-rabbitmq-functional.yml +- import_playbook: test-rabbitmq-functional.yml diff --git a/tests/test-upgrade-pre.yml b/tests/test-upgrade-pre.yml index 8e6d7662..35325cdf 100644 --- a/tests/test-upgrade-pre.yml +++ b/tests/test-upgrade-pre.yml @@ -14,4 +14,4 @@ # limitations under the License. # Setup the host -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-host.yml diff --git a/tests/test.yml b/tests/test.yml index e2e16923..46137563 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -14,10 +14,10 @@ # limitations under the License. # Setup the host -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-host.yml # Install RabbitMQ server -- include: common/test-install-rabbitmq.yml +- import_playbook: common/test-install-rabbitmq.yml # Run functional tests -- include: test-rabbitmq-functional.yml +- import_playbook: test-rabbitmq-functional.yml