From c0d50d74445ea8ab1f81c30e2bfd12f28b9398e7 Mon Sep 17 00:00:00 2001 From: Egon Rijpkema Date: Thu, 22 Mar 2018 09:21:22 +0100 Subject: [PATCH] include is deprecated. --- gcc-site.yml | 26 +++++++++++++------------- roles/common/tasks/main.yml | 4 ++-- site.yml | 28 ++++++++++++++-------------- 3 files changed, 29 insertions(+), 29 deletions(-) diff --git a/gcc-site.yml b/gcc-site.yml index 180c73c..29c71ef 100644 --- a/gcc-site.yml +++ b/gcc-site.yml @@ -1,14 +1,14 @@ --- -- include: common.yml -- include: rabbitmq.yml -- include: memcached.yml -- include: mariadb.yml -- include: keystone.yml -- include: glance-controller.yml -- include: nova-controller.yml -- include: neutron-controller.yml -- include: cinder-controller.yml -- include: cinder-storage.yml -- include: nova-compute.yml -- include: horizon.yml -- include: gcc-post-install.yml +- import_tasks: common.yml +- import_tasks: rabbitmq.yml +- import_tasks: memcached.yml +- import_tasks: mariadb.yml +- import_tasks: keystone.yml +- import_tasks: glance-controller.yml +- import_tasks: nova-controller.yml +- import_tasks: neutron-controller.yml +- import_tasks: cinder-controller.yml +- import_tasks: cinder-storage.yml +- import_tasks: nova-compute.yml +- import_tasks: horizon.yml +- import_tasks: gcc-post-install.yml diff --git a/roles/common/tasks/main.yml b/roles/common/tasks/main.yml index 6d4b966..ffcc600 100644 --- a/roles/common/tasks/main.yml +++ b/roles/common/tasks/main.yml @@ -5,7 +5,7 @@ - name: Passwordless sudo for admins lineinfile: dest=/etc/sudoers line="%admin ALL=(ALL:ALL) NOPASSWD:ALL" -- include: users.yml +- import_tasks: users.yml - name: common | install packages apt: pkg={{ item }} state=latest update_cache=yes @@ -26,4 +26,4 @@ owner: root group: root -- include: docker.yml +- import_tasks: docker.yml diff --git a/site.yml b/site.yml index d1d5f0f..5cb0409 100644 --- a/site.yml +++ b/site.yml @@ -1,15 +1,15 @@ --- -- include: common.yml -- include: rabbitmq.yml -- include: memcached.yml -- include: mariadb.yml -- include: keystone.yml -- include: glance-controller.yml -- include: nova-controller.yml -- include: neutron-controller.yml -- include: cinder-controller.yml -- include: cinder-storage.yml -- include: nova-compute.yml -- include: horizon.yml -- include: heat.yml -- include: post-install.yml +- import_tasks: common.yml +- import_tasks: rabbitmq.yml +- import_tasks: memcached.yml +- import_tasks: mariadb.yml +- import_tasks: keystone.yml +- import_tasks: glance-controller.yml +- import_tasks: nova-controller.yml +- import_tasks: neutron-controller.yml +- import_tasks: cinder-controller.yml +- import_tasks: cinder-storage.yml +- import_tasks: nova-compute.yml +- import_tasks: horizon.yml +- import_tasks: heat.yml +- import_tasks: post-install.yml