From 26b66684a071a132350321388ff33a0e50984f63 Mon Sep 17 00:00:00 2001 From: Emiliano Vavassori Date: Fri, 3 Jun 2016 11:45:55 +0200 Subject: [PATCH] Adjusting git-daemon roles to honor client_gitrepo variable from domain.yml. This permits to specify a different repo than the one for BgLUG. --- roles/git-daemon/defaults/main.yml | 3 +++ roles/git-daemon/tasks/git-daemon.yml | 2 +- roles/git-daemon/tasks/initvars.yml | 9 +++++++++ roles/git-daemon/tasks/main.yml | 4 ++++ 4 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 roles/git-daemon/defaults/main.yml create mode 100644 roles/git-daemon/tasks/initvars.yml diff --git a/roles/git-daemon/defaults/main.yml b/roles/git-daemon/defaults/main.yml new file mode 100644 index 0000000..7c6a62a --- /dev/null +++ b/roles/git-daemon/defaults/main.yml @@ -0,0 +1,3 @@ +--- +client_gitrepo: "https://github.com/bglug-it/client-pull-installation.git" +client_gitbranch: master diff --git a/roles/git-daemon/tasks/git-daemon.yml b/roles/git-daemon/tasks/git-daemon.yml index bcd2d1b..ca38917 100644 --- a/roles/git-daemon/tasks/git-daemon.yml +++ b/roles/git-daemon/tasks/git-daemon.yml @@ -48,7 +48,7 @@ # E' in forma di shell perché non c'è modo di passare ad ansible # il parametro --mirror - name: Clono il repository client-pull-installation - shell: git clone --mirror https://github.com/bglug-it/client-pull-installation.git /var/lib/git-daemon/repositories/client-pull-installation.git + shell: git clone --mirror {{ client_gitrepo }} /var/lib/git-daemon/repositories/client-pull-installation.git become: yes become_user: git-daemon when: chk_clientpullinstall_repo|changed diff --git a/roles/git-daemon/tasks/initvars.yml b/roles/git-daemon/tasks/initvars.yml new file mode 100644 index 0000000..935cce5 --- /dev/null +++ b/roles/git-daemon/tasks/initvars.yml @@ -0,0 +1,9 @@ +--- + +- name: Overriding default gitrepo if defined in domain.yml + set_fact: client_gitrepo="{{ ansible_local.domain.client_gitrepo }}" + when: "ansible_local.domain.client_gitrepo is defined" + +- name: Overriding default gitbranch if defined in domain.yml + set_fact: client_gitbranch="{{ ansible_local.domain.client_gitbranch }}" + when: "ansible_local.domain.client_gitbranch is defined" diff --git a/roles/git-daemon/tasks/main.yml b/roles/git-daemon/tasks/main.yml index 982d853..7cf9097 100644 --- a/roles/git-daemon/tasks/main.yml +++ b/roles/git-daemon/tasks/main.yml @@ -1,3 +1,7 @@ --- + +- include: initvars.yml + tags: git-daemon + - include: git-daemon.yml tags: git-daemon