From 1e9e6f61f63bc59e510fa834b80914ff57337839 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Tue, 16 Feb 2016 15:16:55 +0100 Subject: [PATCH] Managing remote mirror and mirrorpath as variables at domain.yml level. --- roles/preseed/tasks/main.yml | 5 ----- roles/preseed/tasks/preseed.yml | 15 +++++++++++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/roles/preseed/tasks/main.yml b/roles/preseed/tasks/main.yml index e8ba54c..a47fdf1 100644 --- a/roles/preseed/tasks/main.yml +++ b/roles/preseed/tasks/main.yml @@ -1,10 +1,5 @@ --- -- name: Configuring executive mirror path - set_fact: - execmirrorpath: "{{ ansible_local.domain.mirrorpath }}" - when: ansible_local.domain.mirror_mode == 'nfs' or ansible_local.domain.mirror_mode == 'local' - - include: preseed.yml tags: - preseed diff --git a/roles/preseed/tasks/preseed.yml b/roles/preseed/tasks/preseed.yml index 20f4b58..9d83c5d 100644 --- a/roles/preseed/tasks/preseed.yml +++ b/roles/preseed/tasks/preseed.yml @@ -1,4 +1,19 @@ --- +- name: Configuring executive mirror path + set_fact: + execmirrorpath: "{{ ansible_local.domain.mirrorpath }}" + when: ansible_local.domain.mirror_mode == 'nfs' or ansible_local.domain.mirror_mode == 'local' + +- name: Overriding remote_mirror with defaults from domain.yml + set_fact: + remote_mirror: "{{ ansible_local.domain.remote_mirror }}" + when: ansible_local.domain.remote_mirror is defined + +- name: Overriding remote_mirrorpath with defaults from domain.yml + set_fact: + remote_mirror: "{{ ansible_local.domain.remote_mirrorpath }}" + when: ansible_local.domain.remote_mirrorpath is defined + - name: Verifica configurazione ibay preseed shell: /sbin/e-smith/db accounts show ks register: chk_ks_created