From 9baebe36845a6b04bdc050184a746e5da7c74265 Mon Sep 17 00:00:00 2001
From: Sorin Sbarnea <ssbarnea@redhat.com>
Date: Tue, 5 May 2020 10:15:49 +0100
Subject: [PATCH] yamlint: EOF newlines and comments indent

Fixed two rules which where temporary disabled during introduction
of the linter.

Change-Id: Icd1e1b40b1e8207ab5ff7088a48e8f0a800e3aa8
---
 .yamllint                                       | 2 --
 playbooks/chart-testing/pre.yaml                | 2 +-
 roles/collect-container-logs/defaults/main.yaml | 2 +-
 roles/configure-mirrors/handlers/main.yaml      | 2 +-
 roles/ensure-chart-testing/defaults/main.yaml   | 2 +-
 roles/ensure-helm/defaults/main.yaml            | 2 +-
 roles/ensure-helm/tasks/main.yaml               | 2 +-
 test-playbooks/ensure-python-pyenv.yaml         | 2 +-
 8 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/.yamllint b/.yamllint
index 3ac156d9a..e31949dcc 100644
--- a/.yamllint
+++ b/.yamllint
@@ -9,7 +9,6 @@ rules:
   brackets:
     max-spaces-inside: 1
     level: error
-  comments-indentation: disable
   document-start: disable
   empty-lines:
     max: 1
@@ -17,6 +16,5 @@ rules:
   indentation:
     level: error
     indent-sequences: consistent
-  new-line-at-end-of-file: disable
   line-length: disable
   truthy: false
diff --git a/playbooks/chart-testing/pre.yaml b/playbooks/chart-testing/pre.yaml
index 2a8a6b68d..3352e08de 100644
--- a/playbooks/chart-testing/pre.yaml
+++ b/playbooks/chart-testing/pre.yaml
@@ -2,4 +2,4 @@
 - hosts: all
   roles:
   - ensure-helm
-  - ensure-chart-testing
\ No newline at end of file
+  - ensure-chart-testing
diff --git a/roles/collect-container-logs/defaults/main.yaml b/roles/collect-container-logs/defaults/main.yaml
index 1d18111b7..d540a884d 100644
--- a/roles/collect-container-logs/defaults/main.yaml
+++ b/roles/collect-container-logs/defaults/main.yaml
@@ -1 +1 @@
-container_command: docker
\ No newline at end of file
+container_command: docker
diff --git a/roles/configure-mirrors/handlers/main.yaml b/roles/configure-mirrors/handlers/main.yaml
index 9da9235ef..e2da4eea1 100644
--- a/roles/configure-mirrors/handlers/main.yaml
+++ b/roles/configure-mirrors/handlers/main.yaml
@@ -14,10 +14,10 @@
     warn: false
   with_items:
     - "{{ ansible_pkg_mgr }} clean all"
+    # verbose is needed in order to make it possible to debug potential failures
     - "{{ ansible_pkg_mgr }} makecache -v"
   loop_control:
     loop_var: zj_command
-  # verbose is needed in order to make it possible to debug potential failures
 
 - name: Update zypper cache
   become: yes
diff --git a/roles/ensure-chart-testing/defaults/main.yaml b/roles/ensure-chart-testing/defaults/main.yaml
index 475c92b35..93ea65d65 100644
--- a/roles/ensure-chart-testing/defaults/main.yaml
+++ b/roles/ensure-chart-testing/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-chart_testing_version: 2.4.0
\ No newline at end of file
+chart_testing_version: 2.4.0
diff --git a/roles/ensure-helm/defaults/main.yaml b/roles/ensure-helm/defaults/main.yaml
index e77eca783..7842d2a0d 100644
--- a/roles/ensure-helm/defaults/main.yaml
+++ b/roles/ensure-helm/defaults/main.yaml
@@ -1,2 +1,2 @@
 ---
-helm_version: 2.16.1
\ No newline at end of file
+helm_version: 2.16.1
diff --git a/roles/ensure-helm/tasks/main.yaml b/roles/ensure-helm/tasks/main.yaml
index b9c31a9e9..232297259 100644
--- a/roles/ensure-helm/tasks/main.yaml
+++ b/roles/ensure-helm/tasks/main.yaml
@@ -17,4 +17,4 @@
   shell: helm init --client-only
   tags:
     # NOTE(mnaser): The `helm` module does not support running init only.
-    - skip_ansible_lint
\ No newline at end of file
+    - skip_ansible_lint
diff --git a/test-playbooks/ensure-python-pyenv.yaml b/test-playbooks/ensure-python-pyenv.yaml
index f0c1ac300..ed1613928 100644
--- a/test-playbooks/ensure-python-pyenv.yaml
+++ b/test-playbooks/ensure-python-pyenv.yaml
@@ -10,4 +10,4 @@
     - name: Check installed version of Python
       command: /usr/local/bin/python3 --version
       register: _check_version
-      failed_when: "'Python 3.8' not in _check_version.stdout"
\ No newline at end of file
+      failed_when: "'Python 3.8' not in _check_version.stdout"