Use simpler file structure

.ansible-lint

@@ -1,5 +0,0 @@
-parseable: true
-quiet: true
-skip_list:
-  - '501'
-use_default_rules: true

.gitlab-ci.yml

@@ -3,40 +3,24 @@ stages:
   - test
 
 cache:
-  key: "$CI_COMMIT_REF_SLUG"
+  key: $CI_COMMIT_REF_SLUG
   paths:
     - .cache/pip
     - node_modules/
 
 lint:
-  stage: lint
-  image: python:3.7
-  before_script:
-    - pip install ansible ansible-lint --quiet
-  script:
-    - ansible-lint playbook.yml
-  only:
-    refs:
-      - development
-      - merge_requests
-
-pretty-lint:
   stage: lint
   image: node:12
   before_script:
-    - npm install
+    - npm install prettier --no-save
   script:
-    - npx prettier "roles/**/*.yml" --check
+    - npx prettier '**/*.yml' --check
-  only:
-    refs:
-      - development
-      - merge_requests
 
 syntax-test:
   stage: test
   image: python:3.7
   before_script:
-    - pip install ansible ansible-lint --quiet
+    - pip install ansible --quiet
     - ansible-galaxy install -r roles/requirements.yml
   script:
     - ansible-playbook playbook.yml --syntax-check

.prettier.json

@@ -1,9 +0,0 @@
-{
-    "singleQuote": true,
-    "printWidth": 90,
-    "tabWidth": 2,
-    "useTabs": false,
-    "bracketSpacing": true,
-    "parser": "yaml"
-}
-

.prettierrc.yml

@@ -0,0 +1,5 @@
+singleQuote: true
+printWidth: 90
+tabWidth: 2
+useTabs: false
+bracketSpacing: true

handlers.yml

@@ -2,4 +2,4 @@
   systemd:
     name: gitlab-runner
     state: restarted
-    enabled: yes
+    enabled: true

inventory.yml

@@ -1,16 +1,16 @@
 gitlab-runner:
   hosts:
     192.168.178.87:
-      host_interface : "en*"
+      host_interface: 'en*'
-      host_ip : "192.168.178.87"
+      host_ip: '192.168.178.87'
-      host_subnet : "24"
+      host_subnet: '24'
-      host_gateway : "192.168.178.1"
+      host_gateway: '192.168.178.1'
-      host_dns : "192.168.178.1"
+      host_dns: '192.168.178.1'
-      hostname: "gitlab-runner-2"
+      hostname: 'gitlab-runner-2'
     192.168.178.192:
-      host_interface : "en*"
+      host_interface: 'en*'
-      host_ip : "192.168.178.192"
+      host_ip: '192.168.178.192'
-      host_subnet : "24"
+      host_subnet: '24'
-      host_gateway : "192.168.178.1"
+      host_gateway: '192.168.178.1'
-      host_dns : "192.168.178.1"
+      host_dns: '192.168.178.1'
-      hostname: "gitlab-runner-1"
+      hostname: 'gitlab-runner-1'

playbook.yml

@@ -1,5 +1,11 @@
 - hosts: gitlab-runner
-  become: yes
+  become: true
   become_method: sudo
   roles:
-    - gitlab_runner
+    - common
+  tasks:
+    - import_tasks: 'tasks.yml'
+  handlers:
+    - import_tasks: 'handlers.yml'
+  vars_files:
+    - 'vars.yml'

roles/gitlab_runner/defaults/main.yml

@@ -1,8 +0,0 @@
-default_user: "sonny"
-
-gitlab_repo: "deb https://packages.gitlab.com/runner/gitlab-runner/debian/ buster main"
-gitlab_runner_gpg: "https://packages.gitlab.com/runner/gitlab-runner/gpgkey"
-
-docker_repo: "deb https://download.docker.com/linux/debian buster stable"
-docker_gpg: "https://download.docker.com/linux/debian/gpg"
-docker_gpg_id: "0EBFCD88"

roles/gitlab_runner/meta/main.yml

@@ -1,16 +0,0 @@
-dependencies:
-  - common
-
-galaxy_info:
-  author: sonny
-  description: "Gitlab-runner installation"
-  license: "license GPLv3"
-  min_ansible_version: 2.7
-  issue_tracker_url: "https://git.fudiggity.nl/ansible/gitlab-runner/-/issues"
-  platforms:
-    - name: Debian
-      versions:
-        - buster
-  galaxy_tags:
-    - development
-    - system

tasks.yml

@@ -1,55 +1,51 @@
 - include_role:
     name: common
-    tasks_from: "network.yml"
+    tasks_from: 'network.yml'
 - include_role:
     name: common
-    tasks_from: "host.yml"
+    tasks_from: 'host.yml'
 
 - name: copy apt preference file
   template:
-    src: "{{ item.src }}"
+    src: '{{ item.src }}'
-    dest: "{{ item.dest }}"
+    dest: '{{ item.dest }}'
     owner: root
     group: root
-    mode: "0600"
+    mode: '0600'
   loop:
     - {
-        src: "apt-pin.j2",
+        src: 'templates/apt-pin.j2',
-        dest: "/etc/apt/preferences.d/pin-gitlab-runner.pref",
+        dest: '/etc/apt/preferences.d/pin-gitlab-runner.pref',
       }
 
 - name: Add docker gpg key
   apt_key:
-    id: "{{ docker_gpg_id }}"
+    id: '{{ docker_gpg_id }}'
-    url: "{{ docker_gpg }}"
+    url: '{{ docker_gpg }}'
-    validate_certs: yes
+    validate_certs: true
     state: present
 
 - name: Add gitlab-runner gpg key
   apt_key:
-    url: "{{ gitlab_runner_gpg }}"
+    url: '{{ gitlab_runner_gpg }}'
-    validate_certs: yes
+    validate_certs: true
     state: present
 
 - name: Add docker repo
   apt_repository:
-    repo: "{{ docker_repo }}"
+    repo: '{{ docker_repo }}'
-    validate_certs: yes
+    validate_certs: true
     state: present
 
 - name: Add gitlab-runner repo
   apt_repository:
-    repo: "{{ gitlab_repo }}"
+    repo: '{{ gitlab_repo }}'
-    validate_certs: yes
+    validate_certs: true
     state: present
 
 - name: install packages # noqa 403
   apt:
-    name:
+    name: '{{ packages }}'
-      - gitlab-runner
-      - docker-ce
-      - docker-ce-cli
-      - containerd.io
     update_cache: true
     state: latest
   notify:
@@ -59,4 +55,7 @@
 
 # see https://gitlab.com/gitlab-org/gitlab-runner/issues/305
 - name: ensure docker is restarted
-  service: name=docker state=restarted enabled=yes
+  systemd:
+    name: docker
+    state: restarted
+    enabled: true

vars.yml

@@ -0,0 +1,14 @@
+default_user: 'sonny'
+
+gitlab_repo: 'deb https://packages.gitlab.com/runner/gitlab-runner/debian/ buster main'
+gitlab_runner_gpg: 'https://packages.gitlab.com/runner/gitlab-runner/gpgkey'
+
+docker_repo: 'deb https://download.docker.com/linux/debian buster stable'
+docker_gpg: 'https://download.docker.com/linux/debian/gpg'
+docker_gpg_id: '0EBFCD88'
+
+packages:
+  - gitlab-runner
+  - docker-ce
+  - docker-ce-cli
+  - containerd.io