Merge branch 'develop' into bugs/81

CHANGELOG.md

@@ -3,7 +3,10 @@ All notable changes to this project will be documented in this file.
 This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a changelog](https://github.com/olivierlacan/keep-a-changelog).
 
 ## Unreleased
+### Added
 - *[#81](https://github.com/idealista/cookiecutter-ansible-role/issues/81) Add log path variable in defaults* @blalop
+- *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add molecule-docker support* @blalop
+- *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add default versions for Python packages* @blalop
 
 ## [2.7.0](https://github.com/idealista/cookiecutter-ansible-role/tree/2.7.0)
 ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.6.1...2.7.0)

cookiecutter.json

@@ -7,10 +7,11 @@
   "company": "Idealista S.A.U.",
   "author": "",
   "min_ansible_version": "",
-  "ansible_version": "",
+  "ansible_version": "4.4.0",
-  "molecule_version": "",
+  "molecule_version": "3.4.0",
-  "python_docker_version": "",
+  "python_docker_version": "5.0.0",
-  "ansible_lint_version":"",
+  "molecule_docker_version": "0.2.4",
+  "ansible_lint_version":"5.1.2",
   "license":"Apache 2.0",
   "galaxy_tag_1":"example_tag1",
   "galaxy_tag_2":"example_tag2",

test.sh

@@ -3,7 +3,22 @@
 set -e
 
 # Generate role
-printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv install -r requirements.txt && pipenv run cookiecutter . --no-input app_name="github_cli" exec_name="gh" author="John Doe" min_ansible_version="2.2" ansible_version="2.8.6" molecule_version="3.0.1" python_docker_version="4.1.0" ansible_lint_version="4.2.0" has_service="False" has_files="False" has_handlers="False" has_templates="False" documentation_URL="https://cli.github.com/manual/" && rm Pipfile* requirements.txt
+printf "cookiecutter==1.7.2\nJinja2==2.11.2" > requirements.txt && pipenv install -r requirements.txt && pipenv run cookiecutter . --no-input \
+    app_name="github_cli" \
+    exec_name="gh" \
+    author="John Doe" \
+    min_ansible_version="2.2" \
+    ansible_version="4.4.0" \
+    molecule_version="3.4.0" \
+    python_docker_version="5.0.0" \
+    molecule_docker_version="0.2.4" \
+    ansible_lint_version="5.1.2" \
+    has_service="False" \
+    has_files="False" \
+    has_handlers="False" \
+    has_templates="False" \
+    documentation_URL="https://cli.github.com/manual/" && rm Pipfile* requirements.txt
+
 (
     # Adjust the role to test
     cd github_cli_role

{{cookiecutter.app_name}}_role/test-requirements.txt

@@ -1,4 +1,5 @@
 ansible=={{ cookiecutter.ansible_version }}
 molecule=={{ cookiecutter.molecule_version }}
 docker=={{ cookiecutter.python_docker_version }}
+molecule-docker=={{ cookiecutter.molecule_docker_version }}
 ansible-lint=={{ cookiecutter.ansible_lint_version }}