Merge pull request #151 from chancez/reload_runner

Support reloading gitlab under systemd instead of restarting

handlers/main.yml

@@ -1,7 +1,7 @@
 ---
 # non macOS
 - name: restart_gitlab_runner
-  service: name=gitlab-runner state=restarted
+  service: name=gitlab-runner state={{ gitlab_runner_restart_state }}
   become: yes
   when: ansible_os_family != 'Darwin' and ansible_os_family != 'Windows' and not gitlab_runner_container_install
 
@@ -19,7 +19,7 @@
 
 # Container
 - name: restart_gitlab_runner_container
-  docker_container: 
+  docker_container:
     name: "{{ gitlab_runner_container_name }}"
     restart: yes
   when: gitlab_runner_container_install

tasks/install-redhat.yml

@@ -33,3 +33,35 @@
     name: "{{ gitlab_runner_package }}"
     state: "{{ gitlab_runner_package_state }}"
   become: true
+
+- name: Ensure /etc/systemd/system/gitlab-runner.service.d/ exists
+  file:
+    path: /etc/systemd/system/gitlab-runner.service.d
+    state: directory
+    owner: root
+    group: root
+    mode: 0755
+
+- name: Add reload command to GitLab Runner system service
+  copy:
+    dest: /etc/systemd/system/gitlab-runner.service.d/exec-reload.conf
+    content: |
+      [Service]
+      ExecReload=/bin/kill -HUP $MAINPID
+  register: gitlab_runner_exec_reload
+
+# https://docs.gitlab.com/runner/configuration/init.html#overriding-systemd
+- name: Configure graceful stop for GitLab Runner system service
+  copy:
+    dest: /etc/systemd/system/gitlab-runner.service.d/kill.conf
+    content: |
+      [Service]
+      TimeoutStopSec={{ gitlab_runner_timeout_stop_seconds }}
+      KillSignal=SIGQUIT
+  when: gitlab_runner_timeout_stop_seconds > 0
+  register: gitlab_runner_kill_timeout
+
+- name: Force systemd to reread configs
+  systemd:
+    daemon_reload: yes
+  when: gitlab_runner_exec_reload.changed or gitlab_runner_kill_timeout

vars/RedHat.yml

@@ -4,3 +4,5 @@ gitlab_runner_executable: "/usr/bin/{{ gitlab_runner_package_name }}"
 
 gitlab_runner_runtime_owner: gitlab-runner
 gitlab_runner_runtime_group: gitlab-runner
+gitlab_runner_restart_state: reloaded
+gitlab_runner_timeout_stop_seconds: 7200

vars/default.yml

@@ -3,3 +3,4 @@ gitlab_runner_container_install: false
 gitlab_runner_container_image: gitlab/gitlab-runner
 gitlab_runner_container_tag: latest
 gitlab_runner_container_name: gitlab-runner
+gitlab_runner_restart_state: restarted