diff --git a/roles/debian_server/meta/main.yml b/roles/debian_server/meta/main.yml deleted file mode 100644 index f869fbbff78b98fd232552044825586979ff09d7..0000000000000000000000000000000000000000 --- a/roles/debian_server/meta/main.yml +++ /dev/null @@ -1,13 +0,0 @@ ---- -galaxy_info: - author: Nimrod Adar - company: Shore - description: Debian server - license: MIT - min_ansible_version: 2.10 - platforms: - - name: Debian - versions: - - Buster -dependencies: - - role: toolbox diff --git a/roles/debian_server/tasks/main.yml b/roles/debian_server/tasks/main.yml index 93c20ded4490d0a026754ba7afbb8a05d0284374..35f6612d019911194a033d0be2551593464aff7e 100644 --- a/roles/debian_server/tasks/main.yml +++ b/roles/debian_server/tasks/main.yml @@ -129,3 +129,7 @@ - name: Include btrfs tasks ansible.builtin.include_tasks: file: btrfs.yml + +- name: Include Toolbox tasks + ansible.builtin.import_tasks: + file: toolbox.yml diff --git a/roles/toolbox/tasks/main.yml b/roles/debian_server/tasks/toolbox.yml similarity index 100% rename from roles/toolbox/tasks/main.yml rename to roles/debian_server/tasks/toolbox.yml diff --git a/roles/toolbox/vars/main.yml b/roles/debian_server/vars/main.yml similarity index 100% rename from roles/toolbox/vars/main.yml rename to roles/debian_server/vars/main.yml diff --git a/roles/toolbox/README.md b/roles/toolbox/README.md deleted file mode 100644 index aa50307c8c8f5c3f633759801cbfd19ec60abde1..0000000000000000000000000000000000000000 --- a/roles/toolbox/README.md +++ /dev/null @@ -1,17 +0,0 @@ -# Toolbox - -Install Podman and Toolbox. - -## Supported distros - -- Debian Buster -- Debian Bullseye -- Debian Sid -- Ubuntu Bionic -- Ubuntu Focal -- ElementaryOS Hera -- ElementaryOS Odin - -Debian Bullseye and Sid have Podman in the Debian repos, the rest don't so the -Kubic repos are used. Toolbox isn't packaged yet, so -[toolbox-build](https://git.shore.co.il/shore/toolbox-build) is used.