From ca06d72356823c156a5f75ee4ab06d65f0ab1bf2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Rafael=20L=C3=A1szl=C3=B3?= <rlacko99@gmail.com> Date: Wed, 28 Jul 2021 21:20:01 +0200 Subject: [PATCH] Update runner playbook --- ansible/runner/README.md | 4 ++++ ansible/runner/tasks/main.yaml | 6 ++++++ ansible/runner/tasks/runner.yaml | 12 +++--------- .../{config.toml.j2 => config.toml.example.j2} | 14 +++++++------- 4 files changed, 20 insertions(+), 16 deletions(-) rename ansible/runner/templates/home/ubuntu/gitlab-runner/{config.toml.j2 => config.toml.example.j2} (67%) diff --git a/ansible/runner/README.md b/ansible/runner/README.md index b9dd5d0..1dbcbcc 100644 --- a/ansible/runner/README.md +++ b/ansible/runner/README.md @@ -14,3 +14,7 @@ Update the variables in `vars` folder. `sudo -s` `cd /home/ubuntu` `podman-compose up -d` + +Register the runner with registration token and then +update the config using `/home/ubuntu/gitlab-runner/config.toml.example` file. + diff --git a/ansible/runner/tasks/main.yaml b/ansible/runner/tasks/main.yaml index 5a3decf..941f8aa 100644 --- a/ansible/runner/tasks/main.yaml +++ b/ansible/runner/tasks/main.yaml @@ -22,5 +22,11 @@ dest: /etc/ssh/sshd_config mode: 0600 +- name: Ensure sshd is restarted and enabled to start at boot. + service: + name: sshd + state: restarted + enabled: yes + - name: Setup Runner include_tasks: runner.yaml diff --git a/ansible/runner/tasks/runner.yaml b/ansible/runner/tasks/runner.yaml index 22f18e3..c33788a 100644 --- a/ansible/runner/tasks/runner.yaml +++ b/ansible/runner/tasks/runner.yaml @@ -1,11 +1,5 @@ --- -- name: Ensure sshd is restarted and enabled to start at boot. - service: - name: sshd - state: restarted - enabled: yes - - name: Install podman compose pip: name: @@ -20,12 +14,12 @@ - name: Copy config toml template: - src: home/ubuntu/gitlab-runner/config.toml.j2 - dest: /home/ubuntu/gitlab-runner/config.toml + src: home/ubuntu/gitlab-runner/config.toml.example.j2 + dest: /home/ubuntu/gitlab-runner/config.toml.example owner: ubuntu group: ubuntu mode: 0700 - backup: true + backup: false become: true - name: Copy compose file diff --git a/ansible/runner/templates/home/ubuntu/gitlab-runner/config.toml.j2 b/ansible/runner/templates/home/ubuntu/gitlab-runner/config.toml.example.j2 similarity index 67% rename from ansible/runner/templates/home/ubuntu/gitlab-runner/config.toml.j2 rename to ansible/runner/templates/home/ubuntu/gitlab-runner/config.toml.example.j2 index 84390fe..998fed9 100644 --- a/ansible/runner/templates/home/ubuntu/gitlab-runner/config.toml.j2 +++ b/ansible/runner/templates/home/ubuntu/gitlab-runner/config.toml.example.j2 @@ -6,9 +6,9 @@ check_interval = 1 session_timeout = 1800 [[runners]] - name = {{ runner.name}} - url = {{ runner.url }} - token = {{ runner.token }} + name = "{{ runner.name }}" + url = "{{ runner.url }}" + token = "some token" executor = "docker" [runners.custom_build_dir] {% if runner.s3cache is defined %} @@ -17,11 +17,11 @@ check_interval = 1 Path = "runner" Shared = true [runners.cache.s3] - ServerAddress = {{ runner.s3cache.server_address }} - BucketName = {{ runner.s3cache.bucket_name }} + ServerAddress = "{{ runner.s3cache.server_address }}" + BucketName = "{{ runner.s3cache.bucket_name }}" Insecure = false - AccessKey = {{ runner.s3cache.access_key }} - SecretKey = {{ runner.s3cache.secret_key }} + AccessKey = "{{ runner.s3cache.access_key }}" + SecretKey = "{{ runner.s3cache.secret_key }}" {% endif %} [runners.docker] tls_verify = false -- GitLab