From 7ee83fd5168f06be526b49022b104aa70e0297a8 Mon Sep 17 00:00:00 2001
From: Sven-Hendrik Haase <svenstaro@gmail.com>
Date: Mon, 22 Jun 2020 19:10:24 +0200
Subject: [PATCH] gitlab-runner: Properly handle our Debian box
---
roles/gitlab-runner/handlers/main.yml | 2 +-
roles/gitlab-runner/tasks/main.yml | 13 ++++++++++---
2 files changed, 11 insertions(+), 4 deletions(-)
diff --git a/roles/gitlab-runner/handlers/main.yml b/roles/gitlab-runner/handlers/main.yml
index 3faff483d..6c495b84c 100644
--- a/roles/gitlab-runner/handlers/main.yml
+++ b/roles/gitlab-runner/handlers/main.yml
@@ -1,2 +1,2 @@
-- name: restart gitlab runner
+- name: restart gitlab-runner
service: name=gitlab-runner state=restarted
diff --git a/roles/gitlab-runner/tasks/main.yml b/roles/gitlab-runner/tasks/main.yml
index 636044bd1..c86964f39 100644
--- a/roles/gitlab-runner/tasks/main.yml
+++ b/roles/gitlab-runner/tasks/main.yml
@@ -2,9 +2,16 @@
- name: install dependencies
pacman: name=docker,python-docker,python-gitlab,gitlab-runner state=present
+ when: ansible_facts['os_family'] == "Arch Linux"
+ notify: restart gitlab-runner
+
+- name: install dependencies
+ apt: name=docker-ce,gitlab-runner state=present update_cache=yes
+ when: ansible_facts['os_family'] == "Debian"
+ notify: restart gitlab-runner
- name: start docker
- service: name=docker enabled=yes state=started
+ systemd: name=docker enabled=yes state=started daemon_reload=yes
- name: open firewall holes
firewalld: port={{ item }} permanent=true state=enabled immediate=yes
@@ -42,7 +49,7 @@
path: /etc/gitlab-runner/config.toml
regexp: '^concurrent = .*'
line: concurrent = 100
- notify: restart gitlab runner
+ notify: restart gitlab-runner
- name: enable and start gitlab runner service
- service: name=gitlab-runner state=started enabled=yes
+ systemd: name=gitlab-runner state=started enabled=yes daemon_reload=yes
--
GitLab