From 034e483b96c928f38bd2bda328126d88059bb08d Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Sat, 19 Nov 2016 17:16:30 +0100 Subject: [PATCH] Fixing issue #5 by re-ordering meta informations between tasks. Minor aesthetic fixes. --- roles/client-install/meta/main.yml | 2 +- roles/preseed/meta/main.yml | 1 + roles/ubuntu-mirror/tasks/mirror-cfg.yml | 1 - roles/ubuntu-mirror/tasks/remote-mirror.yml | 1 - 4 files changed, 2 insertions(+), 3 deletions(-) diff --git a/roles/client-install/meta/main.yml b/roles/client-install/meta/main.yml index ca8d80c..6db33fe 100644 --- a/roles/client-install/meta/main.yml +++ b/roles/client-install/meta/main.yml @@ -1,8 +1,8 @@ --- dependencies: + - { role: ubuntu-mirror, tags: [ 'client-install' ] } - { role: preseed, tags: [ 'client-install' ] } - { role: ansible-pull, tags: [ 'client-install' ] } - - { role: ubuntu-mirror, tags: [ 'client-install' ] } - { role: doraemon, tags: [ 'client-install' ] } - { role: npm, tags: [ 'client-install' ] } - { role: git-daemon, tags: [ 'client-install' ] } diff --git a/roles/preseed/meta/main.yml b/roles/preseed/meta/main.yml index 7474eff..7de2c79 100644 --- a/roles/preseed/meta/main.yml +++ b/roles/preseed/meta/main.yml @@ -1,3 +1,4 @@ --- dependencies: - { role: pxe } + - { role: ubuntu-mirror } diff --git a/roles/ubuntu-mirror/tasks/mirror-cfg.yml b/roles/ubuntu-mirror/tasks/mirror-cfg.yml index e4924b8..a526b2f 100644 --- a/roles/ubuntu-mirror/tasks/mirror-cfg.yml +++ b/roles/ubuntu-mirror/tasks/mirror-cfg.yml @@ -16,4 +16,3 @@ - name: Determining mirror_security_path set_fact: spath="{{ ansible_local.domain.mirror_security_path }}" when: ansible_local.domain.mirror_security_path is defined - diff --git a/roles/ubuntu-mirror/tasks/remote-mirror.yml b/roles/ubuntu-mirror/tasks/remote-mirror.yml index 32eafa8..aa979f7 100644 --- a/roles/ubuntu-mirror/tasks/remote-mirror.yml +++ b/roles/ubuntu-mirror/tasks/remote-mirror.yml @@ -1,3 +1,2 @@ --- # Managing a remote mirror - Doing nothing ;) -