From 384a932ee7a92bc08c179ff5e3dac8bc014762cf Mon Sep 17 00:00:00 2001
From: Lars Beckers <lars.beckers@rwth-aachen.de>
Date: Thu, 13 Dec 2018 19:30:23 +0100
Subject: [PATCH] lint yaml files
---
.yamllint | 19 +++++++++++++++++++
mysql/tasks/main.yml | 14 ++++++++++----
postgres/defaults/main.yml | 2 +-
postgres/tasks/main.yml | 8 ++++----
4 files changed, 34 insertions(+), 9 deletions(-)
create mode 100644 .yamllint
diff --git a/.yamllint b/.yamllint
new file mode 100644
index 0000000..cca80e2
--- /dev/null
+++ b/.yamllint
@@ -0,0 +1,19 @@
+---
+
+extends: default
+
+rules:
+ comments-indentation:
+ level: warning
+ document-start:
+ level: error
+ empty-lines:
+ max: 1
+ empty-values:
+ forbid-in-flow-mappings: true
+ forbid-in-block-mappings: true
+ line-length:
+ level: warning
+ octal-values:
+ forbid-implicit-octal: true
+ level: warning
diff --git a/mysql/tasks/main.yml b/mysql/tasks/main.yml
index 933024a..148223f 100644
--- a/mysql/tasks/main.yml
+++ b/mysql/tasks/main.yml
@@ -26,7 +26,10 @@
- mysql
- name: ensure mysql is started
- service: name=mysql state=started enabled=yes
+ service:
+ name: mysql
+ state: started
+ enabled: true
tags:
- service
- mysql
@@ -34,12 +37,14 @@
- name: ensure the mysql root user exists and has the correct password
mysql_user:
name: root
+ # yamllint disable-line rule:line-length
password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
login_user: root
+ # yamllint disable-line rule:line-length
login_password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
register: mysql_root_creation_result
- no_log: True
- ignore_errors: yes
+ no_log: true
+ ignore_errors: true
tags:
- mysql
- config
@@ -47,8 +52,9 @@
- name: initialize the mysql root user
mysql_user:
name: root
+ # yamllint disable-line rule:line-length
password: "{{ lookup('passwordstore', 'db/{{ ansible_hostname }}-mysql create=true length=20') }}"
- no_log: True
+ no_log: true
when: mysql_root_creation_result|failed
tags:
- mysql
diff --git a/postgres/defaults/main.yml b/postgres/defaults/main.yml
index 496c92b..2e7fe54 100644
--- a/postgres/defaults/main.yml
+++ b/postgres/defaults/main.yml
@@ -1,3 +1,3 @@
---
-postgres_enable_frequently: True
+postgres_enable_frequently: true
diff --git a/postgres/tasks/main.yml b/postgres/tasks/main.yml
index c3df751..c9d8090 100644
--- a/postgres/tasks/main.yml
+++ b/postgres/tasks/main.yml
@@ -15,7 +15,7 @@
service:
name: postgresql
state: started
- enabled: yes
+ enabled: true
tags:
- postgres
@@ -34,7 +34,7 @@
dest: /usr/local/bin/
owner: root
group: root
- mode: 0755
+ mode: '0755'
tags:
- postgres
- rsnapshot
@@ -46,7 +46,7 @@
dest: /etc/
owner: root
group: root
- mode: 0644
+ mode: '0644'
tags:
- postgres
- rsnapshot
@@ -58,7 +58,7 @@
dest: /etc/cron.d/postgres-snapshot
owner: root
group: root
- mode: 0644
+ mode: '0644'
tags:
- postgres
- rsnapshot
--
GitLab