From e98f0e954ee4e54c3561f7ef6bb95c055898f0f4 Mon Sep 17 00:00:00 2001 From: Corbin Bartsch Date: Sun, 9 Oct 2022 20:24:59 -0400 Subject: [PATCH] Linting --- .ansible-lint | 10 ++++++++++ .github/workflows/release.yml | 5 +++-- .yamllint | 8 ++++++++ defaults/main.yml | 2 +- meta/main.yml | 4 +++- tasks/main.yml | 14 ++++++++------ 6 files changed, 33 insertions(+), 10 deletions(-) create mode 100644 .ansible-lint create mode 100644 .yamllint diff --git a/.ansible-lint b/.ansible-lint new file mode 100644 index 0000000..98d8cee --- /dev/null +++ b/.ansible-lint @@ -0,0 +1,10 @@ +--- + +exclude_paths: + - .github/ + - molecule/ + +warn_list: + - internal-error + +# vi: ft=yaml diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index ce1b57d..5cd288a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -1,3 +1,4 @@ +--- name: Release on: workflow_dispatch: @@ -9,7 +10,6 @@ env: GALAXY_USERNAME: IronicBadger jobs: - release: name: Release runs-on: ubuntu-latest @@ -29,4 +29,5 @@ jobs: - name: Trigger a new import on Galaxy. run: >- ansible-galaxy role import --api-key ${{ secrets.GALAXY_API_KEY }} - $(echo ${{ env.GALAXY_USERNAME }}) $(echo ${{ github.repository }} | cut -d/ -f2) + $(echo ${{ env.GALAXY_USERNAME }}) + $(echo ${{ github.repository }} | cut -d/ -f2) diff --git a/.yamllint b/.yamllint new file mode 100644 index 0000000..1e7801d --- /dev/null +++ b/.yamllint @@ -0,0 +1,8 @@ +--- + +extends: default + +ignore: | + .github/ + +# vi: ft=yaml diff --git a/defaults/main.yml b/defaults/main.yml index 8ece2c4..f8efeb3 100644 --- a/defaults/main.yml +++ b/defaults/main.yml @@ -1,4 +1,4 @@ --- docker_compose_generator_output_path: "~" docker_compose_generator_uid: "1000" -docker_compose_generator_gid: "1000" \ No newline at end of file +docker_compose_generator_gid: "1000" diff --git a/meta/main.yml b/meta/main.yml index f720106..8d72ff2 100644 --- a/meta/main.yml +++ b/meta/main.yml @@ -1,9 +1,11 @@ --- galaxy_info: role_name: docker_compose_generator + namespace: ironicbadger author: Alex Kretzschmar description: Create a docker-compose.yml file - issue_tracker_url: https://github.com/ironicbadger/ansible-role-create-users/issues + issue_tracker_url: "https://github.com/ironicbadger/\ + ansible-role-create-users/issues" license: GPLv2 min_ansible_version: 2.4 platforms: diff --git a/tasks/main.yml b/tasks/main.yml index 8333150..2f689b0 100644 --- a/tasks/main.yml +++ b/tasks/main.yml @@ -1,12 +1,14 @@ --- -- name: ensure destination for compose file exists - file: +- name: Ensure destination for compose file exists + ansible.builtin.file: path: "{{ docker_compose_generator_output_path }}" state: directory + mode: 0755 -- name: write docker-compose file - template: - src: ../templates/docker-compose.yml.j2 +- name: Write docker-compose file + ansible.builtin.template: + src: docker-compose.yml.j2 dest: "{{ docker_compose_generator_output_path }}/docker-compose.yml" owner: "{{ docker_compose_generator_uid }}" - group: "{{ docker_compose_generator_gid }}" \ No newline at end of file + group: "{{ docker_compose_generator_gid }}" + mode: 0644