Corrected yamllint (#1217)

* Corrected yamllint errors. * Correctly ignored .molecule directory. * Configured yamllint in strict mode to exit on warnings.
ansible · Mar 29, 2018 · 8accc43 · 8accc43
1 parent be3a896
commit 8accc43
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 5 deletions.
diff --git a/.yamllint b/.yamllint
@@ -1,6 +1,6 @@
 extends: default
 ignore: |
-  *.molecule/*
+  *.molecule/
   molecule/cookiecutter/
 
 rules:

diff --git a/...r/openstack/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/create.yml b/...r/openstack/{{cookiecutter.molecule_directory}}/{{cookiecutter.scenario_name}}/create.yml
@@ -84,7 +84,7 @@
         key_name: "{{ keypair_name }}"
         nics:
           - net-id: "{{ openstack_networks[0]['id'] }}"
-        delete_fip: yes
+        delete_fip: true
       register: server
       with_items: "{{ molecule_yml.platforms }}"
       async: 7200

diff --git a/test/resources/playbooks/delegated/create/openstack.yml b/test/resources/playbooks/delegated/create/openstack.yml
@@ -36,7 +36,7 @@
     key_name: "{{ openstack.key_name }}"
     nics:
       - net-id: "{{ openstack_networks[0]['id'] }}"
-    delete_fip: yes
+    delete_fip: true
   register: server
 
 - name: Persist ssh config

diff --git a/test/resources/playbooks/openstack/create.yml b/test/resources/playbooks/openstack/create.yml
@@ -83,7 +83,7 @@
         key_name: "{{ keypair_name }}"
         nics:
           - net-id: "{{ openstack_networks[0]['id'] }}"
-        delete_fip: yes
+        delete_fip: true
       register: server
       with_items: "{{ molecule_yml.platforms }}"
       async: 7200

diff --git a/tox.ini b/tox.ini
@@ -25,7 +25,7 @@ commands =
     unit: py.test -vv --cov-report=term-missing --cov={toxinidir}/molecule/ --no-cov-on-fail {posargs}
     functional: py.test -vv -x test/functional/ {posargs}
     lint: flake8
-    lint: yamllint test/ molecule/
+    lint: yamllint -s test/ molecule/
 
 [testenv:format]
 commands =