From bcc354b98629324e7403165528de9ca671fc7a31 Mon Sep 17 00:00:00 2001
From: Adar Nimrod <nimrod@shore.co.il>
Date: Fri, 7 May 2021 19:10:45 +0300
Subject: [PATCH] Merge the toolbox role to the debian_server role.

The only reason it was a seperate role was because I thought it could be
useful for workstation. It is but it depends on a bunch of stuff from
the debian_server role. On a new host, it would fail to run before the
debian_server role has (it does because the debian_server role depended
on the toolbox role). When the need arises to use some of the
debian_server tasks in a workstation setting, it will need to be split
to a debian_common role.
---
 roles/debian_server/meta/main.yml               | 13 -------------
 roles/debian_server/tasks/main.yml              |  4 ++++
 .../tasks/toolbox.yml}                          |  0
 roles/{toolbox => debian_server}/vars/main.yml  |  0
 roles/toolbox/README.md                         | 17 -----------------
 5 files changed, 4 insertions(+), 30 deletions(-)
 delete mode 100644 roles/debian_server/meta/main.yml
 rename roles/{toolbox/tasks/main.yml => debian_server/tasks/toolbox.yml} (100%)
 rename roles/{toolbox => debian_server}/vars/main.yml (100%)
 delete mode 100644 roles/toolbox/README.md

diff --git a/roles/debian_server/meta/main.yml b/roles/debian_server/meta/main.yml
deleted file mode 100644
index f869fbb..0000000
--- 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 93c20de..35f6612 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 aa50307..0000000
--- 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.
-- 
GitLab