From 5dc590c7d339ce368509ef24b5a4b3ac7505af11 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Wed, 14 Oct 2015 18:00:18 +0200 Subject: [PATCH] Moving repo corrections on prereq. Temporary fix, this has to be checked before package installation. --- roles/custom/tasks/main.yml | 5 ----- roles/prereq/tasks/main.yml | 5 +++++ roles/{custom => prereq}/tasks/repos.yml | 4 ---- roles/{custom => prereq/templates}/templates/ansible.list | 0 .../{custom => prereq/templates}/templates/libreoffice.list | 0 roles/{custom => prereq/templates}/templates/sources.list | 0 roles/{custom => prereq/templates}/templates/sys42.list | 0 7 files changed, 5 insertions(+), 9 deletions(-) rename roles/{custom => prereq}/tasks/repos.yml (88%) rename roles/{custom => prereq/templates}/templates/ansible.list (100%) rename roles/{custom => prereq/templates}/templates/libreoffice.list (100%) rename roles/{custom => prereq/templates}/templates/sources.list (100%) rename roles/{custom => prereq/templates}/templates/sys42.list (100%) diff --git a/roles/custom/tasks/main.yml b/roles/custom/tasks/main.yml index 3f412ec..00bcd84 100644 --- a/roles/custom/tasks/main.yml +++ b/roles/custom/tasks/main.yml @@ -1,11 +1,6 @@ --- # BgLUG customization -- include: repos.yml - tags: - - custom - - repos - - include: unattended-upgrades.yml tags: - custom diff --git a/roles/prereq/tasks/main.yml b/roles/prereq/tasks/main.yml index d41bb4b..84df53a 100644 --- a/roles/prereq/tasks/main.yml +++ b/roles/prereq/tasks/main.yml @@ -1,3 +1,8 @@ --- - include: prereq.yml tags: prereq + +- include: repos.yml + tags: + - prereq + - repos diff --git a/roles/custom/tasks/repos.yml b/roles/prereq/tasks/repos.yml similarity index 88% rename from roles/custom/tasks/repos.yml rename to roles/prereq/tasks/repos.yml index 99d262d..eac768a 100644 --- a/roles/custom/tasks/repos.yml +++ b/roles/prereq/tasks/repos.yml @@ -21,7 +21,3 @@ template: src: sys42.list dest: /etc/apt/sources.list.d/sys42.list - -- name: Regenerating package cache - apt: update_cache=yes - sudo: yes diff --git a/roles/custom/templates/ansible.list b/roles/prereq/templates/templates/ansible.list similarity index 100% rename from roles/custom/templates/ansible.list rename to roles/prereq/templates/templates/ansible.list diff --git a/roles/custom/templates/libreoffice.list b/roles/prereq/templates/templates/libreoffice.list similarity index 100% rename from roles/custom/templates/libreoffice.list rename to roles/prereq/templates/templates/libreoffice.list diff --git a/roles/custom/templates/sources.list b/roles/prereq/templates/templates/sources.list similarity index 100% rename from roles/custom/templates/sources.list rename to roles/prereq/templates/templates/sources.list diff --git a/roles/custom/templates/sys42.list b/roles/prereq/templates/templates/sys42.list similarity index 100% rename from roles/custom/templates/sys42.list rename to roles/prereq/templates/templates/sys42.list