Dev/cookiecutter-ansible-role-docker
1
0
Fork 0
forked from Mirrors/cookiecutter-ansible-role
Code Issues Pull Requests Packages Projects Releases Wiki Activity

#83 don't leave empty lines when using jinja

Browse Source
This commit is contained in:
Alejandro Blanco Lopez 2021-08-24 12:12:44 +02:00
parent ff5533b940
commit c9e2a83163
3 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@ -7,6 +7,7 @@ This project adheres to [Semantic Versioning](http://semver.org/) and [Keep a ch
- *[#81](https://github.com/idealista/cookiecutter-ansible-role/issues/81) Add log path variable in defaults* @blalop - *[#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 molecule-docker support* @blalop
- *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add default versions for Python packages* @blalop - *[#79](https://github.com/idealista/cookiecutter-ansible-role/issues/79) Add default versions for Python packages* @blalop
- *[#83](https://github.com/idealista/cookiecutter-ansible-role/issues/83) Don't leave empty lines when using jinja* @blalop
## [2.7.0](https://github.com/idealista/cookiecutter-ansible-role/tree/2.7.0) ## [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) ### [Full Changelog](https://github.com/idealista/cookiecutter-ansible-role/compare/2.6.1...2.7.0)

8
{{cookiecutter.app_name}}_role/molecule/default/tests/test_app.yml
View File

@ -22,17 +22,17 @@ group:
{% endif %} {% endif %}
file: file:
/opt/{{ cookiecutter.app_name }}: /opt/{{ cookiecutter.app_name }}:
{% if cookiecutter.has_service == 'True' %} {%- if cookiecutter.has_service == 'True' %}
owner: exampleuser owner: exampleuser
group: examplegroup group: examplegroup
{% endif %} {%- endif %}
exists: true exists: true
filetype: directory filetype: directory
/opt/{{ cookiecutter.app_name }}/bin: /opt/{{ cookiecutter.app_name }}/bin:
{% if cookiecutter.has_service == 'True' %} {%- if cookiecutter.has_service == 'True' %}
owner: exampleuser owner: exampleuser
group: examplegroup group: examplegroup
{% endif %} {%- endif %}
exists: true exists: true
filetype: directory filetype: directory

12
{{cookiecutter.app_name}}_role/tasks/install.yml
View File

@ -21,10 +21,10 @@
- name: {{ cookiecutter.app_name | upper }} | Ensure skeleton paths - name: {{ cookiecutter.app_name | upper }} | Ensure skeleton paths
file: file:
dest: "{% raw %}{{{% endraw %} item {% raw %}}}{% endraw %}" dest: "{% raw %}{{{% endraw %} item {% raw %}}}{% endraw %}"
{% if cookiecutter.has_service == 'True' %} {%- if cookiecutter.has_service == 'True' %}
owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}" owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}"
group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}" group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}"
{% endif %} {%- endif %}
state: directory state: directory
with_items: with_items:
- "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_skeleton_paths {% raw %}}}{% endraw %}" - "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_skeleton_paths {% raw %}}}{% endraw %}"
@ -34,10 +34,10 @@
- name: {{ cookiecutter.app_name | upper }} | Ensure skeleton log paths - name: {{ cookiecutter.app_name | upper }} | Ensure skeleton log paths
file: file:
dest: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_log_path {% raw %}}}{% endraw %}" dest: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_log_path {% raw %}}}{% endraw %}"
{% if cookiecutter.has_service == 'True' %} {%- if cookiecutter.has_service == 'True' %}
owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}" owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}"
group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}" group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}"
{% endif %} {%- endif %}
state: directory state: directory
when: {{ cookiecutter.app_name }}_log_file is defined when: {{ cookiecutter.app_name }}_log_file is defined
tags: tags:
@ -73,10 +73,10 @@
copy: copy:
src: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_src_bin {% raw %}}}{% endraw %}" src: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_src_bin {% raw %}}}{% endraw %}"
dest: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_bin_path {% raw %}}}{% endraw %}/{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_exec_name {% raw %}}}{% endraw %}" dest: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_bin_path {% raw %}}}{% endraw %}/{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_exec_name {% raw %}}}{% endraw %}"
{% if cookiecutter.has_service == 'True' %} {%- if cookiecutter.has_service == 'True' %}
owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}" owner: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_user {% raw %}}}{% endraw %}"
group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}" group: "{% raw %}{{{% endraw %} {{ cookiecutter.app_name }}_group {% raw %}}}{% endraw %}"
{% endif %} {%- endif %}
remote_src: True remote_src: True
mode: 0755 mode: 0755
when: {{ cookiecutter.app_name }}_force_reinstall or {{ cookiecutter.app_name }}_check is failed or {{ cookiecutter.app_name }}_version not in {{ cookiecutter.app_name }}_check.stderr when: {{ cookiecutter.app_name }}_force_reinstall or {{ cookiecutter.app_name }}_check is failed or {{ cookiecutter.app_name }}_version not in {{ cookiecutter.app_name }}_check.stderr