Various fixes

- apt-key is deprecated, copy unarmored keyfile instead
- fixes for lint, metadata, galaxy, etc.

Change-Id: I4849a15c1ffbe4ed2048ff2a2e0170c2baff4622
diff --git a/Makefile b/Makefile
index f14e1d8..69609eb 100644
--- a/Makefile
+++ b/Makefile
@@ -23,10 +23,13 @@
     -d "{extends: default, rules: {line-length: {max: 99}}}" \
     -s $(YAML_FILES)
 
+# List of molecule files, not including base molecule.yml which isn't ansible format
+MOLECULE_FILES ?= $(shell find molecule -type f -name '*.yml' \! -name 'molecule.yml' -print )
+
 ansiblelint: ## lint check with ansible-lint
 	ansible-lint --version
 	ansible-lint -v .
-	ansible-lint -v molecule/*/*
+	ansible-lint -v $(MOLECULE_FILES)
 
 license: ## Check license with the reuse tool
 	reuse --version