From e6f7d110beda8877a129ef5df70f94072bb5995d Mon Sep 17 00:00:00 2001
From: Martin Pietsch <martin.pietsch@tu-dresden.de>
Date: Mon, 7 Dec 2020 10:12:57 +0100
Subject: [PATCH] replaced import/include tasks by the SDM OOR tasks
---
tasks/answerfile.yml | 6 +++---
tasks/configure.yml | 6 +++---
tasks/finaliseinstaller.yml | 11 +++++------
tasks/installer.yml | 7 +++++--
tasks/main.yml | 10 +++++-----
tasks/reboot.yml | 4 ----
tasks/upgrade.yml | 2 --
7 files changed, 21 insertions(+), 25 deletions(-)
delete mode 100644 tasks/reboot.yml
delete mode 100644 tasks/upgrade.yml
diff --git a/tasks/answerfile.yml b/tasks/answerfile.yml
index fb098c2..eb21e27 100644
--- a/tasks/answerfile.yml
+++ b/tasks/answerfile.yml
@@ -1,7 +1,7 @@
-- import_role:
- name: system
- tasks_from: answerfile
+- call_tasks:
+ from: answerfile
+ super: true
- name: create answer file
template:
diff --git a/tasks/configure.yml b/tasks/configure.yml
index 3c40b72..21cadaf 100644
--- a/tasks/configure.yml
+++ b/tasks/configure.yml
@@ -1,8 +1,8 @@
---
-- import_role:
- name: system
- tasks_from: configure
+- call_tasks:
+ from: configure
+ super: true
- name: install locale.gen file
template:
diff --git a/tasks/finaliseinstaller.yml b/tasks/finaliseinstaller.yml
index 569a53f..57e2180 100644
--- a/tasks/finaliseinstaller.yml
+++ b/tasks/finaliseinstaller.yml
@@ -35,16 +35,15 @@
args:
chdir: "{{ _linux_temporary_root_directory.path }}"
-- include_role:
- name: system.linux
- tasks_from: _mergeimages
+- call_tasks:
+ from: _mergeimages
loop: "{{ system_supported_architectures[linux_installer_distribution] }}"
loop_control:
loop_var: _linux_dist_arch
-- include_role:
- name: system
- tasks_from: installer
+- call_tasks:
+ from: installer
+ super: true
- name: cleanup temporary root directory
file:
diff --git a/tasks/installer.yml b/tasks/installer.yml
index 61fbad0..1fc09eb 100644
--- a/tasks/installer.yml
+++ b/tasks/installer.yml
@@ -1,3 +1,6 @@
-- include_tasks: buildinstaller.yml
-- include_tasks: finaliseinstaller.yml
+- call_tasks:
+ from: buildinstaller.yml
+
+- call_tasks:
+ from: finaliseinstaller.yml
diff --git a/tasks/main.yml b/tasks/main.yml
index d1c10e4..9c48837 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,9 +1,9 @@
---
# tasks file for sytsem.linux
-- include_role:
- name: system
+- call_tasks:
+ from: main
+ super: true
-- import_role:
- name: system.linux
- tasks_from: configure
+- call_tasks:
+ from: configure
diff --git a/tasks/reboot.yml b/tasks/reboot.yml
deleted file mode 100644
index 73e9972..0000000
--- a/tasks/reboot.yml
+++ /dev/null
@@ -1,4 +0,0 @@
----
-- include_role:
- name: system
- tasks_from: reboot
diff --git a/tasks/upgrade.yml b/tasks/upgrade.yml
deleted file mode 100644
index cd21505..0000000
--- a/tasks/upgrade.yml
+++ /dev/null
@@ -1,2 +0,0 @@
----
-
--
GitLab