Merge pull request #1075 from grycap/devel

Remove deprecated includes

IM/ConfManager.py

@@ -660,7 +660,7 @@ def generate_mount_disks_tasks(system):
                 if disk_mount_path and disk_fstype:
                     # This recipe works with EC2, OpenNebula and Azure. It must be
                     # tested/completed with other providers
-                    res += '  - include: utils/tasks/disk_format_mount.yml\n'
+                    res += '  - include_tasks: utils/tasks/disk_format_mount.yml\n'
                     res += '    vars:\n'
                     res += '      device: "/dev/{{item.key}}"\n'
                     res += '      mount_path: "' + disk_mount_path + '"\n'
@@ -692,7 +692,7 @@ def generate_main_playbook(self, vm, group, tmp_dir):
 
         conf_content += "  pre_tasks: \n"
         # Basic tasks set copy /etc/hosts ...
-        conf_content += "  - include: utils/tasks/main.yml\n"
+        conf_content += "  - include_tasks: utils/tasks/main.yml\n"
 
         conf_content += "  tasks: \n"
         conf_content += "  - debug: msg='Install user requested apps'\n"
@@ -1320,7 +1320,7 @@ def create_all_recipe(tmp_dir, filename, group="allnowindows", suffix="_all.yml"
         conf_all_out = open(tmp_dir + "/" + all_filename, 'w')
         conf_all_out.write("---\n")
         conf_all_out.write("- hosts: " + group + "\n")
-        conf_all_out.write("- include: " + filename + ".yml\n")
+        conf_all_out.write("- import_playbook: " + filename + ".yml\n")
         conf_all_out.write("\n\n")
         conf_all_out.close()
         return all_filename