From b50edd2045f9b829ceebaaf9204fbfeb55e91137 Mon Sep 17 00:00:00 2001 From: Cian Hatton Date: Tue, 6 Sep 2022 09:22:43 +0100 Subject: [PATCH] fixing linting errors --- roles/setup_docker/tasks/main.yml | 40 +++++----- roles/setup_hosted_services/handlers/main.yml | 7 +- roles/setup_hosted_services/meta/main.yml | 18 ++--- roles/setup_hosted_services/tasks/main.yml | 77 ++++++++++--------- 4 files changed, 70 insertions(+), 72 deletions(-) diff --git a/roles/setup_docker/tasks/main.yml b/roles/setup_docker/tasks/main.yml index d4a9895..f667b8f 100644 --- a/roles/setup_docker/tasks/main.yml +++ b/roles/setup_docker/tasks/main.yml @@ -7,46 +7,44 @@ # following official instructions here: https://docs.docker.com/engine/install/debian/ - name: Install packages using apt - apt: + ansible.builtin.apt: name: - - ca-certificates - - curl - - gnupg2 - - lsb-release - - pip + - ca-certificates + - curl + - gnupg2 + - lsb-release + - pip state: present update_cache: true - name: Add Docker GPG apt Key - apt_key: + ansible.builtin.apt_key: url: https://download.docker.com/linux/debian/gpg state: present # TODO: paramaterize this - name: Add Docker Repository - apt_repository: + ansible.builtin.apt_repository: repo: deb https://download.docker.com/linux/debian buster stable state: present - name: Install docker packages using apt - apt: + ansible.builtin.apt: name: - - docker-ce - - docker-ce-cli - - containerd.io - - docker-compose-plugin + - docker-ce + - docker-ce-cli + - containerd.io + - docker-compose-plugin state: present update_cache: true -- name: Install Docker Module for Python - pip: - name: docker - -- name: Install Docker Compose Module for Python - pip: - name: docker-compose +- name: Install Docker Modules for Python + ansible.builtin.pip: + name: + - docker + - docker-compose - name: Ensure docker is started - service: + ansible.builtin.service: name: docker state: started diff --git a/roles/setup_hosted_services/handlers/main.yml b/roles/setup_hosted_services/handlers/main.yml index 9d69602..8a24310 100644 --- a/roles/setup_hosted_services/handlers/main.yml +++ b/roles/setup_hosted_services/handlers/main.yml @@ -1,10 +1,9 @@ # handlers file for setup_hosted_services - name: restart-dashy - command: docker restart dashy - ignore_errors: true + ansible.builtin.command: docker restart dashy - name: restart-olivetin - command: docker restart olivetin + ansible.builtin.command: docker restart olivetin - name: restart-docker-volume-backup - command: docker restart docker-volume-backup + ansible.builtin.command: docker restart docker-volume-backup diff --git a/roles/setup_hosted_services/meta/main.yml b/roles/setup_hosted_services/meta/main.yml index c934c93..ed7baaa 100644 --- a/roles/setup_hosted_services/meta/main.yml +++ b/roles/setup_hosted_services/meta/main.yml @@ -1,18 +1,12 @@ galaxy_info: author: Cian Hatton namespace: chatton - description: your role description - company: your company (optional) + description: Deploy all my hosted services license: MIT - min_ansible_version: 2.1 + min_ansible_version: "2.1" galaxy_tags: [] - # List tags for your role here, one per line. A tag is a keyword that describes - # and categorizes the role. Users find roles by searching for tags. Be sure to - # remove the '[]' above, if you add tags to this list. - # - # NOTE: A tag is limited to a single word comprised of alphanumeric characters. - # Maximum 20 tags per role. - + platforms: + - name: Debian + versions: + - all dependencies: [] - # List your role dependencies here, one per line. Be sure to remove the '[]' above, - # if you add dependencies to this list. diff --git a/roles/setup_hosted_services/tasks/main.yml b/roles/setup_hosted_services/tasks/main.yml index 3ed4d84..f8e46e6 100644 --- a/roles/setup_hosted_services/tasks/main.yml +++ b/roles/setup_hosted_services/tasks/main.yml @@ -1,63 +1,71 @@ +--- - name: Docker | Pull images docker_image: - name: '{{item}}' + name: '{{ item }}' source: pull with_items: - - ubuntu - - busybox + - ubuntu + - busybox - name: Docker Compose | Create a directory if it does not exist - file: - path: '{{directories.docker_compose_directory}}/{{item.name}}' + ansible.builtin.file: + path: '{{ directories.docker_compose_directory }}/{{ item.name }}' state: directory mode: '0755' - with_items: '{{services}}' + with_items: '{{ services }}' - name: Docker Compose | Template Docker Compose Files - template: - src: '{{item.name}}.j2' - dest: '{{directories.docker_compose_directory}}/{{item.name}}/docker-compose.yml' - with_items: '{{services}}' + ansible.builtin.template: + src: '{{ item.name }}.j2' + dest: '{{ directories.docker_compose_directory }}/{{ item.name }}/docker-compose.yml' + owner: root + group: root + mode: 0440 + with_items: '{{ services }}' - name: Directories | Ensure required directories - file: - path: '{{item}}' + ansible.builtin.file: + path: '{{ item }}' state: directory mode: '0755' with_items: - - '{{dashy.config_directory}}' - - '{{olivetin.config_directory}}' - - '{{directories.backups_dir}}/.s3tmp' + - '{{ dashy.config_directory }}' + - '{{ olivetin.config_directory }}' + - '{{ directories.backups_dir }}/.s3tmp' - name: Dashy | Config Files - copy: - src: '{{dashy.source_file}}' - dest: '{{dashy.config_directory}}/{{dashy.config_file}}' + ansible.builtin.copy: + src: '{{ dashy.source_file }}' + dest: '{{ dashy.config_directory }}/{{ dashy.config_file }}' + owner: root + group: root + mode: 0440 notify: - - restart-dashy + - restart-dashy - name: Olivetin | Config Files - copy: - src: '{{olivetin.source_file}}' - dest: '{{olivetin.config_directory}}/{{olivetin.config_file}}' + ansible.builtin.copy: + src: '{{ olivetin.source_file }}' + dest: '{{ olivetin.config_directory }}/{{ olivetin.config_file }}' + owner: root + group: root + mode: 0440 notify: - - restart-olivetin + - restart-olivetin - name: Install python dependencies (requests) - pip: + ansible.builtin.pip: name: requests - name: Docker | Find docker volumes - shell: docker volume ls -f name={{item.name}} --format '{{ '{{' }} .Name {{ '}}'}}' - with_items: '{{services}}' + ansible.builtin.shell: docker volume ls -f name={{ item.name }} --format '{{ '{{' }} .Name {{ '}}' }}' + with_items: '{{ services }}' register: find_volumes changed_when: false -- debug: msg="{{ find_volumes.results | map(attribute='stdout_lines') | list | flatten }}" - - name: Docker | Find volumes that need to be restored - script: scripts/find-volumes-to-restore.py + ansible.builtin.script: scripts/find-volumes-to-restore.py environment: EXISTING_VOLUMES: "{{ find_volumes.results | map(attribute='stdout_lines') | list | flatten }}" SERVICES: '{{ services }}' @@ -67,17 +75,16 @@ register: python_output changed_when: false -- debug: msg="{{ python_output.stdout_lines | list }}" - -- set_fact: - restore_volumes: "{{ restore_volumes | default([]) + [{ 'volume_name': item}] }}" +- name: Build list of volumes to restore. + ansible.builtin.set_fact: + restore_volumes: "{{ restore_volumes | default([]) + [{'volume_name':item}] }}" with_items: "{{ python_output.stdout_lines | list }}" - name: Restore any missing volumes from S3 - include_role: + ansible.builtin.include_role: name: chatton.docker_backup.docker_s3_volume_restore when: restore_volumes is defined - ignore_errors: true + # ignore_errors: true vars: docker_backup_restore_force: false docker_backup_restore_latest_s3_key: true