linting-refactor.diff

diff --git a/git/.yamllint b/git/.yamllint
index ddc48e2..62ca263 100644
--- a/git/.yamllint
+++ b/git/.yamllint
@@ -1,5 +1,15 @@
+# -*- mode: yaml -*-
+# vim:ts=2:sw=2:ai:si:syntax=yaml
+#
+# yamllint configuration directives
+# Project Homepage: https://github.com/adrienverge/yamllint
+#
+# Overriding rules in files:
+# http://yamllint.readthedocs.io/en/latest/disable_with_comments.html
+---
 extends: default
 
+# Rules documentation: http://yamllint.readthedocs.io/en/latest/rules.html
 rules:
 
   braces:
@@ -31,6 +41,15 @@ rules:
     # Disabling to allow for code comment blocks and #!/usr/bin/ansible-playbook
     require-starting-space: false
 
+  empty-lines:
+    # Defaults
+    # max: 2
+    # max-start: 0
+    # max-end: 0
+
+    # Ensure that we only have up to 1 empty line at the EOF
+    max-end: 1
+
   indentation:
     # Defaults
     # spaces: consistent
diff --git a/utils/Makefile b/utils/Makefile
index 55f8640..22e315f 100644
--- a/utils/Makefile
+++ b/utils/Makefile
@@ -32,6 +32,9 @@ ASCII2MAN = a2x -D $(dir $@) -d manpage -f manpage $<
 MANPAGES := docs/man/man1/atomic-openshift-installer.1
 VERSION := 1.3
 
+YAMLFILES = $(shell find ../ -name $(VENV) -prune -o \( -name '*.yml' -o -name '*.yaml' \) ! -path "*/files/*" 2>&1)
+PYFILES = $(shell find ../ -name $(VENV) -prune -o -name ooinstall.egg-info -prune -o -name test -prune -o -name "*.py" -print)
+
 sdist: clean
 	python setup.py sdist
 	rm -fR $(SHORTNAME).egg-info
@@ -86,14 +89,14 @@ ci-pylint: $(VENV)
 	@echo "#############################################"
 	@echo "# Running PyLint Tests in virtualenv"
 	@echo "#############################################"
-	. $(VENV)/bin/activate && python -m pylint --rcfile ../git/.pylintrc $(shell find ../ -name $(VENV) -prune -o -name ooinstall.egg-info -prune -o -name test -prune -o -name "*.py" -print)
+	. $(VENV)/bin/activate && python -m pylint --rcfile ../git/.pylintrc $(PYFILES)
 
 ci-yamllint: $(VENV)
 	@echo "#############################################"
 	@echo "# Running yamllint Tests in virtualenv"
 	@echo "#############################################"
-	# Skipping all '/files/' folders due to conflicting yaml file definitions
-	. $(NAME)env/bin/activate && yamllint -c ../git/.yamllint $(shell find ../ -name $(NAME)env -prune -o \( -name '*.yml' -o -name '*.yaml' \) ! -path "*/files/*" 2>&1)
+# Skipping all '/files/' folders due to conflicting yaml file definitions
+	@. $(VENV)/bin/activate && yamllint -c ../git/.yamllint $(YAMLFILES)
 
 ci-list-deps: $(VENV)
 	@echo "#############################################"