Remove yamllint ignore and fix linting issues (#143)

pabrahamsson · oybed · commit ab374a35c9fc · 2019-08-15T09:50:58.000-03:00
* Remove yamllint ignore and fix linting issues

* Use molecule for linting, merge rules
diff --git a/.ansible-lint b/.ansible-lint
diff --git a/.travis.yml b/.travis.yml
@@ -34,9 +34,6 @@ install:
   - curl -LO ${KUBE_BINARY} && chmod +x ./kubectl && sudo mv ./kubectl /bin/kubectl
 
 before_script:
-  # Linting
-  - yamllint .
-  - ansible-lint playbooks/openshift-cluster-seed.yml
   # Configure Docker
   - sudo service docker stop
   - sudo mkdir -p /etc/docker
diff --git a/.yamllint b/.yamllint
diff --git a/molecule/default/destroy.yml b/molecule/default/destroy.yml
@@ -2,7 +2,7 @@
 
 - hosts: all
   connection: local
-  gather_facts: no
+  gather_facts: false
   tasks:
     - block:
         - name: Check hosts are available
@@ -18,12 +18,12 @@
 
 - hosts: available_hosts
   connection: local
-  gather_facts: no
+  gather_facts: false
   tasks:
     - name: Delete Test Project
       command: >
         oc delete project oa-ci-multi-files-dir1
-      ignore_errors: yes
+      ignore_errors: true
       delegate_to: "{{ groups['seed-hosts'] | first }}"
 
 - name: Destroy
diff --git a/molecule/default/playbook.yml b/molecule/default/playbook.yml
@@ -6,7 +6,7 @@
       find:
         paths: "{{ playbook_dir }}/../../tests/inventories"
         file_type: directory
-        recurse: no
+        recurse: false
       register: tests
       delegate_to: localhost
   tasks:
diff --git a/molecule/default/prepare.yml b/molecule/default/prepare.yml
@@ -6,7 +6,7 @@
       unarchive:
         src: "{{ oc_binary_url }}"
         dest: "/usr/local/bin"
-        remote_src: yes
+        remote_src: true
     - name: Download Kubectl Binary
       get_url:
         url: "{{ kube_binary_url }}"
diff --git a/molecule/yamllint.yml b/molecule/yamllint.yml
@@ -3,6 +3,14 @@
 extends: default
 
 rules:
+  braces:
+    max-spaces-inside: 1
+    level: error
+  brackets:
+    max-spaces-inside: 1
+    level: error
+  indentation:
+    indent-sequences: consistent
   line-length:
     level: error
     max: 250
diff --git a/roles/openshift-applier/defaults/main.yml b/roles/openshift-applier/defaults/main.yml
@@ -4,6 +4,6 @@ default_oc_action: apply
 tmp_inv_dir: ''
 include_tags: ''
 exclude_tags: ''
-provision: True
+provision: true
 params_from_vars: {}
 oc_ignore_unknown_parameters: true
diff --git a/roles/openshift-applier/tasks/process-content.yml b/roles/openshift-applier/tasks/process-content.yml
@@ -3,7 +3,7 @@
 - name: "Include any pre-processing role(s) before applying content"
   include_tasks: pre-post-step.yml
   with_items:
-  - "{{ entry.pre_steps | default('') }}"
+    - "{{ entry.pre_steps | default('') }}"
   loop_control:
     loop_var: step
 
diff --git a/roles/openshift-applier/tasks/process-jinja.yml b/roles/openshift-applier/tasks/process-jinja.yml
@@ -11,7 +11,7 @@
       state: directory
     register: jinja_tmp_dir
     notify:
-      - Clean up temporary Jinja directory
+    - Clean up temporary Jinja directory
 
   - name: Set processed Jinja template output path
     set_fact:
diff --git a/roles/openshift-applier/tasks/process-one-entry.yml b/roles/openshift-applier/tasks/process-one-entry.yml
@@ -9,7 +9,7 @@
     params: "{{ content.params | default('') }}"
     params_from_vars: "{{ content.params_from_vars | default({}) }}"
     oc_ignore_unknown_parameters: "{{ content.ignore_unknown_parameters | default(oc_ignore_unknown_parameters) }}"
-    no_log: False
+    no_log: false
 
 - name: "Set oc_action to delete when in deprovision mode"
   set_fact:
@@ -19,7 +19,7 @@
 
 - name: "Set no_log when specified"
   set_fact:
-    no_log: True
+    no_log: true
   when: (entry.no_log is defined and entry.no_log|bool) or (content.no_log is defined and content.no_log|bool)
 
 - name: "Set the target namespace option if supplied"
diff --git a/roles/openshift-applier/tasks/process-template.yml b/roles/openshift-applier/tasks/process-template.yml
@@ -10,7 +10,7 @@
     - name: "Check whether parameters file exists"
       stat:
         path: "{{ params }}"
-      ignore_errors: yes
+      ignore_errors: true
       register: params_result
       delegate_to: localhost
     - name: "Fail when params file does  not exist"
diff --git a/tests/files/dependency/galaxy_requirements.yml b/tests/files/dependency/galaxy_requirements.yml
@@ -1,4 +1,4 @@
 ---
 
 - src: https://github.com/redhat-cop/casl-ansible
-  version: master
+  version: master
diff --git a/tests/files/imagestreams/python.yml b/tests/files/imagestreams/python.yml
@@ -1,3 +1,4 @@
+---
 apiVersion: image.openshift.io/v1
 kind: ImageStream
 metadata:
diff --git a/tests/files/patches/patch1.yml b/tests/files/patches/patch1.yml
@@ -1,3 +1,4 @@
+---
 metadata:
   labels:
     test: label
diff --git a/tests/files/patches/python-is-patch.yml b/tests/files/patches/python-is-patch.yml
@@ -1,3 +1,4 @@
+---
 spec:
   tags:
     - name: "2.7"
diff --git a/tests/inventories/cluster-template/host_vars/localhost.yml b/tests/inventories/cluster-template/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/deprecated-vars/group_vars/all.yml b/tests/inventories/deprecated-vars/group_vars/all.yml
@@ -14,16 +14,16 @@ openshift_cluster_content:
       NAMESPACE_DESCRIPTION: OpenShift Applier Deprecation Test (description)
     action: create
     tags:
-      - project
-      - route
+    - project
+    - route
 - object: route-test
   content:
   - name: Create route from template and params_from_vars
     template: "{{ inventory_dir }}/../../files/routes/template1.yml"
-    params_from_vars: 
+    params_from_vars:
       FQDN: test.deprecation.com
       NAME: deprecation1-test
-      NAMESPACE: "{{ test_namespace }}" 
+      NAMESPACE: "{{ test_namespace }}"
     namespace: "{{ test_namespace }}"
     tags:
-      - route
+    - route
diff --git a/tests/inventories/jinja-templates/group_vars/seed-hosts.yml b/tests/inventories/jinja-templates/group_vars/seed-hosts.yml
@@ -1,9 +1,9 @@
 ---
 
 environments:
-  - dev
-  - test
-  - prod
+- dev
+- test
+- prod
 namespace_metadata:
   NAMESPACE: oa-ci-jinja-templates
   NAMESPACE_DISPLAY_NAME: OpenShift Applier Jinja Templates Test 1 (displayName)
diff --git a/tests/inventories/jinja-templates/host_vars/localhost.yml b/tests/inventories/jinja-templates/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/multi-files-dir/host_vars/localhost.yml b/tests/inventories/multi-files-dir/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/multi-params-dir/host_vars/localhost.yml b/tests/inventories/multi-params-dir/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/params-from-both/host_vars/localhost.yml b/tests/inventories/params-from-both/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/params-from-file/host_vars/localhost.yml b/tests/inventories/params-from-file/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/params-from-vars/host_vars/localhost.yml b/tests/inventories/params-from-vars/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/patch/host_vars/localhost.yml b/tests/inventories/patch/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
diff --git a/tests/inventories/pre-post-steps/host_vars/localhost.yml b/tests/inventories/pre-post-steps/host_vars/localhost.yml
@@ -1,3 +1,3 @@
 ---
 
-ansible_connection: local
+ansible_connection: local
