From b11ca7fe21dcd44b6afc68ed11bb61948f7d5396 Mon Sep 17 00:00:00 2001 From: Jake Howard Date: Thu, 23 Apr 2020 21:32:18 +0100 Subject: [PATCH] Convert netdata into its own role --- ansible/main.yml | 1 + ansible/roles/docker/tasks/main.yml | 3 --- .../{docker/files/netdata => netdata/files}/docker-compose.yml | 0 .../roles/{docker/tasks/netdata.yml => netdata/tasks/main.yml} | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename ansible/roles/{docker/files/netdata => netdata/files}/docker-compose.yml (100%) rename ansible/roles/{docker/tasks/netdata.yml => netdata/tasks/main.yml} (94%) diff --git a/ansible/main.yml b/ansible/main.yml index e96bc95..4a53c47 100644 --- a/ansible/main.yml +++ b/ansible/main.yml @@ -22,4 +22,5 @@ - "{{ user }}" - docker-cleanup - traefik + - netdata - docker diff --git a/ansible/roles/docker/tasks/main.yml b/ansible/roles/docker/tasks/main.yml index 0429bb8..97d8f9f 100644 --- a/ansible/roles/docker/tasks/main.yml +++ b/ansible/roles/docker/tasks/main.yml @@ -19,9 +19,6 @@ - name: Install librespeed include: librespeed.yml -- name: Install netdata - include: netdata.yml - - name: Install nextcloud include: nextcloud.yml diff --git a/ansible/roles/docker/files/netdata/docker-compose.yml b/ansible/roles/netdata/files/docker-compose.yml similarity index 100% rename from ansible/roles/docker/files/netdata/docker-compose.yml rename to ansible/roles/netdata/files/docker-compose.yml diff --git a/ansible/roles/docker/tasks/netdata.yml b/ansible/roles/netdata/tasks/main.yml similarity index 94% rename from ansible/roles/docker/tasks/netdata.yml rename to ansible/roles/netdata/tasks/main.yml index 0709123..414bc22 100644 --- a/ansible/roles/docker/tasks/netdata.yml +++ b/ansible/roles/netdata/tasks/main.yml @@ -8,7 +8,7 @@ - name: Install netdata compose file template: - src: files/netdata/docker-compose.yml + src: files/docker-compose.yml dest: /opt/netdata/docker-compose.yml mode: "{{ docker_compose_file_mask }}" owner: "{{ docker_user.name }}"