diff --git a/.github/workflows/ci-ansible.yml b/.github/workflows/ci-ansible.yml index bbc9a40..6731eeb 100644 --- a/.github/workflows/ci-ansible.yml +++ b/.github/workflows/ci-ansible.yml @@ -9,8 +9,8 @@ jobs: ansible: runs-on: ubuntu-latest steps: - - uses: actions/checkout@v2 - - uses: ansible-community/ansible-lint-action@v6 + - uses: actions/checkout@v4 + - uses: ansible/ansible-lint@v24.7.0 with: args: "ansible" - run: 'echo "VM_TOKEN=foo" > .env' diff --git a/ansible/local.yml b/ansible/local.yml index 2dffea1..98b0801 100644 --- a/ansible/local.yml +++ b/ansible/local.yml @@ -1,27 +1,28 @@ --- -- hosts: all +- name: Node Playbook + hosts: all gather_facts: true become: true vars: manage_datadog: "{{ MANAGE_DATADOG | default('false') }}" manage_docker: "{{ MANAGE_DOCKER | default('true') }}" tasks: - - name: nodePlaybook | Update apt cache - apt: + - name: NodePlaybook | Update Apt Cache + ansible.builtin.apt: update_cache: true cache_valid_time: '{{ 60 * 60 * 24 }}' tags: - always when: ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' - - name: nodePlaybook | Include geerlingguy.docker role - include_role: + - name: NodePlaybook | Include Geerlingguy Docker Role + ansible.builtin.include_role: name: geerlingguy.docker apply: tags: - docker vars: - docker_apt_arch: "{{ { 'aarch64': 'arm64', 'x86_64': 'amd64' }[ansible_facts.architecture] }}" + docker_apt_arch: "{{ {'aarch64': 'arm64', 'x86_64': 'amd64'}[ansible_facts.architecture] }}" docker_compose_version: "v2.2.3" docker_users: "{{ DOCKER_USERS | default(['ubuntu']) }}" docker_daemon_options: @@ -30,8 +31,8 @@ - always when: manage_docker | bool - - name: nodePlaybook | install DataDog - include_role: + - name: NodePlaybook | Install DataDog + ansible.builtin.include_role: name: datadog.datadog apply: tags: @@ -57,8 +58,8 @@ tags: - product:claims - - name: nodePlaybook | include vm_frontend role - include_role: + - name: NodePlaybook | Include VM Frontend Role + ansible.builtin.include_role: name: vm_frontend apply: tags: diff --git a/ansible/requirements.yml b/ansible/requirements.yml index f35d6d9..f4c4830 100644 --- a/ansible/requirements.yml +++ b/ansible/requirements.yml @@ -1,6 +1,7 @@ # Collections collections: - name: community.general + - name: community.docker # From Galaxy roles: - src: datadog.datadog diff --git a/ansible/roles/vm_frontend/defaults/main.yml b/ansible/roles/vm_frontend/defaults/main.yml index e152a0b..071ea72 100644 --- a/ansible/roles/vm_frontend/defaults/main.yml +++ b/ansible/roles/vm_frontend/defaults/main.yml @@ -1,5 +1,5 @@ --- -redis_enabled: false +vm_frontend_redis_enabled: false vm_frontend_version: 'main' vm_frontend_image: 'ghcr.io/blinklabs-io/discoin-vm-frontend:{{ vm_frontend_version }}' vm_frontend_port: 3000