From 8adf037392746665ca6fe56a2f50fdc7a9356e3a Mon Sep 17 00:00:00 2001 From: Laur Ivan Date: Tue, 11 Apr 2023 22:16:41 +0200 Subject: [PATCH] chore: Updates and cleanups - Update ansible lint version - Add default doc link - Support for 4.x molecule version --- ansible-role-{{cookiecutter.app_name}}/meta/main.yml | 6 +++--- cookiecutter.json | 4 ++-- hooks/post_gen_project.py | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/ansible-role-{{cookiecutter.app_name}}/meta/main.yml b/ansible-role-{{cookiecutter.app_name}}/meta/main.yml index 0f7e634..3333871 100644 --- a/ansible-role-{{cookiecutter.app_name}}/meta/main.yml +++ b/ansible-role-{{cookiecutter.app_name}}/meta/main.yml @@ -6,8 +6,8 @@ galaxy_info: company: {% if cookiecutter.company != "" %}{{ cookiecutter.company }}{% endif %} role_name: {{ cookiecutter.app_name }} description: {{ cookiecutter.app_name | replace('_',' ') | title }} Role - min_ansible_version: {{ cookiecutter.min_ansible_version }} - min_ansible_container_version: {{ cookiecutter.min_ansible_container_version }} + min_ansible_version: "{{ cookiecutter.min_ansible_version }}" + min_ansible_container_version: "{{ cookiecutter.min_ansible_container_version }}" license: {{ cookiecutter.license }} galaxy_tags: - {{ cookiecutter.galaxy_tag_1 }} @@ -19,6 +19,6 @@ galaxy_info: - {{ ver }}{% endfor %} {% endif %}{% if cookiecutter.platforms.ubuntu_list %} - name: Ubuntu - versions: {% for ver in cookiecutter.platforms.ubuntu_list %} + versions:{% for ver in cookiecutter.platforms.ubuntu_list %} - {{ ver }}{% endfor %} {% endif %} \ No newline at end of file diff --git a/cookiecutter.json b/cookiecutter.json index 25f5087..6d3a13d 100644 --- a/cookiecutter.json +++ b/cookiecutter.json @@ -13,7 +13,7 @@ "molecule_version": "4.0.4", "python_docker_version": "6.0.1", "molecule_docker_version": "2.1.0", - "ansible_lint_version":"6.12.2", + "ansible_lint_version":"6.14.4", "yamllint_version": "1.29.0", "license":"MIT", "galaxy_tag_1":"tag1", @@ -26,5 +26,5 @@ "has_files":["True", "False"], "has_handlers":["True", "False"], "has_templates":["True", "False"], - "documentation_URL":"" + "documentation_URL":"https://www.laurivan.com" } diff --git a/hooks/post_gen_project.py b/hooks/post_gen_project.py index 4f272eb..bcac44f 100755 --- a/hooks/post_gen_project.py +++ b/hooks/post_gen_project.py @@ -12,8 +12,8 @@ def checkInput(): print("Error: app_name should not have _role or -role at the end, try again without it") print(" The name of the role will the value you introduce in app_name plus _role appended") sys.exit(1) - if not moleculeVersion.startswith("3"): - print("Error: Only supported molecule version 3.x.x, please change it and try again") + if not (moleculeVersion.startswith("3") or moleculeVersion.startswith("4")): + print("Error: Only supported molecule version 3.x.x or 4.x.x, please change it and try again") sys.exit(1) def configureRole():