From a06971afc413d69a8ec97d5c2d5ce01f505d31b3 Mon Sep 17 00:00:00 2001
From: Asara <amarpreet@minhas.io>
Date: Thu, 7 Jan 2021 20:01:52 -0500
Subject: [PATCH] Prep for lnd, update packages + make hashi stuff a little
 more generic

---
 ansible/group_vars/all/main.yml                    | 14 ++++++++++----
 .../host_vars/redwingcherokee.minhas.io/main.yml   |  5 +++++
 ansible/inventory.txt                              |  4 ++++
 ansible/roles/common/tasks/Debian.yml              |  3 +++
 ansible/roles/common/tasks/Debian_pki.yml          |  2 +-
 ansible/roles/consul/defaults/main.yml             |  1 +
 ansible/roles/consul/tasks/Debian.yml              |  2 +-
 7 files changed, 25 insertions(+), 6 deletions(-)
 create mode 100644 ansible/host_vars/redwingcherokee.minhas.io/main.yml

diff --git a/ansible/group_vars/all/main.yml b/ansible/group_vars/all/main.yml
index 4a4f917..2ad43b5 100644
--- a/ansible/group_vars/all/main.yml
+++ b/ansible/group_vars/all/main.yml
@@ -2,12 +2,15 @@
 # main
 main_dc_name: columbia
 
+# hashicorp defaults
+hashi_arch: amd64
+
 # consul
-consul_version: 1.8.4
+consul_version: 1.9.1
 consul_domain: masked.name
 
 # vault
-vault_version: 1.5.2
+vault_version: 1.6.1
 vault_pki_policy: masked-dot-name
 vault_ca_cert_name: MaskedName_Root_CA.crt
 vault_ca_cert_payload: |
@@ -56,9 +59,12 @@ vault_ca_cert_payload: |
   -----END CERTIFICATE-----
 
 # nomad
-nomad_version: 0.12.5
+nomad_version: 1.0.1
 nomad_podman_driver_version: 0.1.0
 
 # podman
-podman_version: 2.0.6+dfsg1-2
+podman_version: 2.1.1+dfsg1-4
+
+# lnd
+lnd_version: v0.12.0-beta.rc3
 ...
diff --git a/ansible/host_vars/redwingcherokee.minhas.io/main.yml b/ansible/host_vars/redwingcherokee.minhas.io/main.yml
new file mode 100644
index 0000000..ac07efa
--- /dev/null
+++ b/ansible/host_vars/redwingcherokee.minhas.io/main.yml
@@ -0,0 +1,5 @@
+---
+hashi_arch: arm
+consul_arch: armhfv6
+lnd_arch: armv7
+...
diff --git a/ansible/inventory.txt b/ansible/inventory.txt
index 577f4b2..c7a232d 100644
--- a/ansible/inventory.txt
+++ b/ansible/inventory.txt
@@ -3,12 +3,16 @@ fatman.minhas.io
 ivyking.minhas.io
 ranger.minhas.io
 sedan.minhas.io
+redwingcherokee.minhas.io
 
 [consul_server]
 fatman.minhas.io
 ivyking.minhas.io
 sedan.minhas.io
 
+[lnd]
+redwingcherokee.minhas.io
+
 [nexus]
 ivyking.minhas.io
 
diff --git a/ansible/roles/common/tasks/Debian.yml b/ansible/roles/common/tasks/Debian.yml
index c5e2a3e..20b4e54 100644
--- a/ansible/roles/common/tasks/Debian.yml
+++ b/ansible/roles/common/tasks/Debian.yml
@@ -14,10 +14,12 @@
 - name: install default packages
   apt:
     name:
+      - acl
       - dbus
       - git
       - htop
       - inxi
+      - make
       - ncdu
       - netcat
       - ntp
@@ -27,6 +29,7 @@
       - sysstat
       - tmux
       - tree
+      - unzip
       - vim
     state: present
 
diff --git a/ansible/roles/common/tasks/Debian_pki.yml b/ansible/roles/common/tasks/Debian_pki.yml
index b554a41..8ffce7b 100644
--- a/ansible/roles/common/tasks/Debian_pki.yml
+++ b/ansible/roles/common/tasks/Debian_pki.yml
@@ -25,7 +25,7 @@
 
 - name: get vault
   unarchive:
-    src: "https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_amd64.zip"
+    src: "https://releases.hashicorp.com/vault/{{ vault_version }}/vault_{{ vault_version }}_linux_{{ hashi_arch }}.zip"
     dest: /usr/local/bin/
     mode: 0755
     owner: root
diff --git a/ansible/roles/consul/defaults/main.yml b/ansible/roles/consul/defaults/main.yml
index f5f06b0..f5bc514 100644
--- a/ansible/roles/consul/defaults/main.yml
+++ b/ansible/roles/consul/defaults/main.yml
@@ -1,3 +1,4 @@
 ---
 consul_config_path: /etc/consul.d
+consul_arch: '{{ hashi_arch }}'
 ...
diff --git a/ansible/roles/consul/tasks/Debian.yml b/ansible/roles/consul/tasks/Debian.yml
index 9db2501..b20e878 100644
--- a/ansible/roles/consul/tasks/Debian.yml
+++ b/ansible/roles/consul/tasks/Debian.yml
@@ -55,7 +55,7 @@
 
 - name: get consul
   unarchive:
-    src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_amd64.zip"
+    src: "https://releases.hashicorp.com/consul/{{ consul_version }}/consul_{{ consul_version }}_linux_{{ consul_arch }}.zip"
     dest: /usr/local/bin/
     mode: 0755
     owner: root