From d70b99cfcb7b1edc698c7779259ff83f4a92f74c Mon Sep 17 00:00:00 2001 From: ZhijunWei Date: Sun, 19 Aug 2018 11:38:05 -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: I4bc3b952a87ff0351070f87746ee4b63e590aa2d --- extras/os-monasca-install.yml | 4 ++-- tasks/main.yml | 16 ++++++++-------- tasks/monasca_db_setup.yml | 6 +++--- tests/test-install-monasca.yml | 2 +- tests/test.yml | 10 +++++----- 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/extras/os-monasca-install.yml b/extras/os-monasca-install.yml index f47fa48..fd66a25 100644 --- a/extras/os-monasca-install.yml +++ b/extras/os-monasca-install.yml @@ -24,9 +24,9 @@ tags: - monasca pre_tasks: - - include: common-tasks/os-lxc-container-setup.yml + - include_tasks: common-tasks/os-lxc-container-setup.yml - - include: common-tasks/os-log-dir-setup.yml + - include_tasks: common-tasks/os-log-dir-setup.yml vars: log_dirs: - src: "/openstack/log/{{ inventory_hostname }}-monasca" diff --git a/tasks/main.yml b/tasks/main.yml index 4403355..0ad299a 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -28,36 +28,36 @@ tags: - always -- include: monasca_pre_install.yml +- include_tasks: monasca_pre_install.yml when: inventory_hostname in groups['monasca_api'] tags: - monasca-install -- include: monasca_install.yml +- include_tasks: monasca_install.yml when: inventory_hostname in groups['monasca_api'] tags: - monasca-install -- include: monasca_thresh_install.yml +- include_tasks: monasca_thresh_install.yml when: inventory_hostname in groups['monasca_api'] tags: - monasca-install -- include: monasca_post_install.yml +- include_tasks: monasca_post_install.yml when: inventory_hostname in groups['monasca_api'] tags: - monasca-config -- include: monasca_init_{{ ansible_service_mgr }}.yml +- include_tasks: monasca_init_{{ ansible_service_mgr }}.yml when: inventory_hostname in groups['monasca_api'] tags: - monasca-config -- include: monasca_db_setup.yml +- include_tasks: monasca_db_setup.yml tags: - monasca-config -- include: monasca_service_setup.yml +- include_tasks: monasca_service_setup.yml when: inventory_hostname == groups['monasca_api'][0] tags: - monasca-config @@ -65,7 +65,7 @@ - name: Flush handlers meta: flush_handlers -- include: monasca_alarms_setup.yml +- include_tasks: monasca_alarms_setup.yml when: inventory_hostname == groups['monasca_api'][0] tags: - monasca-alarms diff --git a/tasks/monasca_db_setup.yml b/tasks/monasca_db_setup.yml index a5a3061..ab6e524 100644 --- a/tasks/monasca_db_setup.yml +++ b/tasks/monasca_db_setup.yml @@ -11,13 +11,13 @@ # See the License for the specific language governing permissions and # limitations under the License. -- include: monasca_influxdb_setup.yml +- include_tasks: monasca_influxdb_setup.yml when: inventory_hostname in groups['monasca_api'] vars: ansible_python_interpreter: "{{ monasca_bin }}/python" -- include: monasca_mysql_setup.yml +- include_tasks: monasca_mysql_setup.yml when: inventory_hostname in groups['monasca_api'] -- include: monasca_kafka_setup.yml +- include_tasks: monasca_kafka_setup.yml when: inventory_hostname in groups['monasca_kafka'] diff --git a/tests/test-install-monasca.yml b/tests/test-install-monasca.yml index 3fa4ac8..d54bebb 100644 --- a/tests/test-install-monasca.yml +++ b/tests/test-install-monasca.yml @@ -16,7 +16,7 @@ # (c) 2016 Donovan Francesco # (c) 2016 Paul Stevens -- include: "{{ playbook_dir }}/../examples/monasca-dependencies.yml" +- import_playbook: "{{ playbook_dir }}/../examples/monasca-dependencies.yml" - name: Install monasca server hosts: monasca_all diff --git a/tests/test.yml b/tests/test.yml index 2ae0e97..eba7970 100644 --- a/tests/test.yml +++ b/tests/test.yml @@ -17,16 +17,16 @@ # (c) 2016 Paul Stevens # Setup the host -- include: common/test-setup-host.yml +- import_playbook: common/test-setup-host.yml # Install RabbitMQ/MariaDB -- 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 monasca -- include: test-install-monasca.yml +- import_playbook: test-install-monasca.yml # Install tempest -- include: common/test-install-tempest.yml +- import_playbook: common/test-install-tempest.yml