From a0def4f2b3699c3c3d942afc88c57e7249444842 Mon Sep 17 00:00:00 2001
From: Ilya Kreymer <ikreymer@users.noreply.github.com>
Date: Mon, 16 Oct 2023 18:55:35 -0700
Subject: [PATCH] ansible microk8s additional cleanup (#1295)

follow-up to #1264:
- microk8s: move default inventory vars role defaults
- microk8s: improve debugging of template output
- do: move teardown tasks to new role
---
 ansible/install_microk8s.yml                           |  2 --
 .../digital_ocean/teardown/tasks/main.yml}             |  0
 .../microk8s/common/defaults}/main.yml                 |  0
 ansible/roles/microk8s/common/tasks/main.yml           | 10 +++-------
 4 files changed, 3 insertions(+), 9 deletions(-)
 rename ansible/{group_vars/do/teardown.yml => roles/digital_ocean/teardown/tasks/main.yml} (100%)
 rename ansible/{inventory/microk8s/group_vars => roles/microk8s/common/defaults}/main.yml (100%)

diff --git a/ansible/install_microk8s.yml b/ansible/install_microk8s.yml
index 6004638d..21910f55 100644
--- a/ansible/install_microk8s.yml
+++ b/ansible/install_microk8s.yml
@@ -2,8 +2,6 @@
 - hosts: all
   gather_facts: yes
   become: yes
-  vars_files:
-    - inventory/microk8s/group_vars/main.yml
   roles:
     - microk8s/debian # Change to redhat if using a redhat distro
     - microk8s/common
diff --git a/ansible/group_vars/do/teardown.yml b/ansible/roles/digital_ocean/teardown/tasks/main.yml
similarity index 100%
rename from ansible/group_vars/do/teardown.yml
rename to ansible/roles/digital_ocean/teardown/tasks/main.yml
diff --git a/ansible/inventory/microk8s/group_vars/main.yml b/ansible/roles/microk8s/common/defaults/main.yml
similarity index 100%
rename from ansible/inventory/microk8s/group_vars/main.yml
rename to ansible/roles/microk8s/common/defaults/main.yml
diff --git a/ansible/roles/microk8s/common/tasks/main.yml b/ansible/roles/microk8s/common/tasks/main.yml
index 4bdd72d8..6b700acb 100644
--- a/ansible/roles/microk8s/common/tasks/main.yml
+++ b/ansible/roles/microk8s/common/tasks/main.yml
@@ -219,10 +219,6 @@
   tags:
     - helm_upgrade
 
-- name: Debug Print
-  command: cat "{{ browsertrix_cloud_home }}/chart/{{ project_name }}-values.yaml"
-  register: command_output
-
-- name: Debug Template
-  debug:
-    msg: "{{command_output.stdout}}"
+- name: microk8s deploy | debug | show values yaml
+  ansible.builtin.debug:
+    msg: "{{ lookup('ansible.builtin.template', './btrix_values.j2') }}"