From cdf2ed8b9ad4040f69e0487b824533b56b121aa9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9mi=20-=20Le=20Filament?= <remi@le-filament.com>
Date: Wed, 5 Jul 2023 15:49:38 +0200
Subject: [PATCH] [UPD] ansible-lint
---
.ansible-lint | 7 +++++++
.yamllint | 39 +++++++++++++++++++++++++++++++++++++++
meta/main.yml | 22 +++++++++++-----------
tasks/main.yml | 36 ++++++++++++++++++------------------
4 files changed, 75 insertions(+), 29 deletions(-)
create mode 100644 .ansible-lint
create mode 100644 .yamllint
diff --git a/.ansible-lint b/.ansible-lint
new file mode 100644
index 0000000..8d40d06
--- /dev/null
+++ b/.ansible-lint
@@ -0,0 +1,7 @@
+---
+warn_list: # or 'skip_list' to silence them completely
+ - git-latest # Git checkouts must contain explicit version
+ - ignore-errors # Use failed_when and specify error conditions instead of using ignore_errors
+ - no-changed-when # Commands should not change things if nothing needs doing
+ - no-handler # Tasks that run when changed should likely be handlers
+ - package-latest # Package installs should not use latest
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..fbebdb8
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,39 @@
+---
+# Based on ansible-lint config
+extends: default
+
+rules:
+ braces:
+ max-spaces-inside: 1
+ level: error
+ brackets:
+ max-spaces-inside: 1
+ level: error
+ colons:
+ max-spaces-after: -1
+ level: error
+ commas:
+ max-spaces-after: -1
+ level: error
+ # comments enable
+ comments: enable
+ comments-indentation: enable
+ document-start: enable
+ empty-lines:
+ max: 3
+ level: error
+ hyphens:
+ level: error
+ indentation:
+ level: warning
+ indent-sequences: consistent
+ spaces: 4
+ check-multi-line-strings: true
+ key-duplicates: enable
+ line-length: disable
+ new-line-at-end-of-file: enable
+ new-lines:
+ type: unix
+ # trailing-spaces enable
+ trailing-spaces: enable
+ truthy: enable
diff --git a/meta/main.yml b/meta/main.yml
index ce822b3..cc66855 100644
--- a/meta/main.yml
+++ b/meta/main.yml
@@ -1,13 +1,13 @@
---
galaxy_info:
- author: Rémi
- description: Role for deploying and configuring GitLab CE edition
- company: Le Filament (https://le-filament.com)
- license: AGPL-3.0-or-later
- min_ansible_version: 2.1
- platforms:
- - name: Ubuntu
- versions:
- - focal
- galaxy_tags:
- - gitlab
+ author: lefilament
+ description: Role for deploying and configuring GitLab CE edition
+ company: Le Filament (https://le-filament.com)
+ license: AGPL-3.0-or-later
+ min_ansible_version: "2.1"
+ platforms:
+ - name: Ubuntu
+ versions:
+ - focal
+ galaxy_tags:
+ - gitlab
diff --git a/tasks/main.yml b/tasks/main.yml
index 1505f4d..11ef8b0 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -1,38 +1,38 @@
---
- name: Install apt-transport-https package
- package:
- name: apt-transport-https
- state: latest
+ ansible.builtin.package:
+ name: apt-transport-https
+ state: latest
async: 120
poll: 10
when: ansible_os_family == "Debian" and not ansible_check_mode
- name: Add GitLab Runner GPG key to APT
- get_url:
- url: "{{ gitlab_runner_gpg_key_url }}"
- dest: /etc/apt/trusted.gpg.d/gitlab-runner.asc
- mode: '0644'
+ ansible.builtin.get_url:
+ url: "{{ gitlab_runner_gpg_key_url }}"
+ dest: /etc/apt/trusted.gpg.d/gitlab-runner.asc
+ mode: '0644'
when: ansible_os_family == "Debian"
- name: Add GitLab repo to APT repositories
- apt_repository:
- repo: deb {{ gitlab_runner_packages_url }}/{{ ansible_distribution|lower }} {{ ansible_distribution_release }} main
- update_cache: true
+ ansible.builtin.apt_repository:
+ repo: deb {{ gitlab_runner_packages_url }}/{{ ansible_distribution | lower }} {{ ansible_distribution_release }} main
+ update_cache: true
when: ansible_os_family == "Debian"
- name: Install GitLab Runner package
- package:
- name:
- - gitlab-runner
- - docker.io
- state: latest
+ ansible.builtin.package:
+ name:
+ - gitlab-runner
+ - docker.io
+ state: latest
async: 300
poll: 10
when: not ansible_check_mode
- name: Check installed GitLab Runner package
- package:
- name: gitlab-runner
- state: latest
+ ansible.builtin.package:
+ name: gitlab-runner
+ state: latest
when: ansible_check_mode
--
GitLab