From 83a15d1c512dddb7d949dc0e8971e8be38c4ddac Mon Sep 17 00:00:00 2001
From: James Hackett <jamesthackett1@gmail.com>
Date: Fri, 9 Dec 2022 00:26:23 +0000
Subject: [PATCH] fixes hashicorp key add

---
 ansible/redbrick-ansible.yml               | 10 ++---
 ansible/roles/apt/tasks/main.yml           |  3 +-
 ansible/roles/hashicorp-apt/tasks/main.yml | 52 ++++++++++++++++++----
 3 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/ansible/redbrick-ansible.yml b/ansible/redbrick-ansible.yml
index c49fea8..010957e 100644
--- a/ansible/redbrick-ansible.yml
+++ b/ansible/redbrick-ansible.yml
@@ -1,16 +1,16 @@
 ---
 
-- name: Redbrick Nomad, Consul and general management
+- name: Redbrick general management
   hosts: all
   gather_facts: true
   roles:
-    #- { role: apt } # update all packages, equivalent to `apt update && apt upgrade`
+    - { role: apt } # update all packages, equivalent to `apt update && apt upgrade`
     #- { role: ssh } # add users defined in roles/defaults/main.yml
     #- { role: fail2ban } # add and configure fail2ban with jail file located in `templates/fail2ban.jail`
 
 - name: Configure Nomad & Consul
   hosts: nomad
   roles:
-    # - { role: hashicorp-apt } # add hashicorp apt repo to apt sources
-    # - { role: configure-nomad } # install nomad, configure and start the client & server based on `templates/` on nomad group
-    # - { role: configure-consul } # install consul, configure and start the client & server based on `templates/` on nomad group
+    #- { role: hashicorp-apt } # add hashicorp apt repo to apt sources
+    #- { role: configure-nomad } # install nomad, configure and start the client & server based on `templates/` on nomad group
+    #- { role: configure-consul } # install consul, configure and start the client & server based on `templates/` on nomad group
diff --git a/ansible/roles/apt/tasks/main.yml b/ansible/roles/apt/tasks/main.yml
index 0433175..e00816c 100644
--- a/ansible/roles/apt/tasks/main.yml
+++ b/ansible/roles/apt/tasks/main.yml
@@ -16,7 +16,8 @@
   register: result
 
 - name: Show Output
-  debug: msg="{{ result.stdout_lines }}"
+  debug:
+    msg: "{{ result.stdout_lines }}"
 
 - name: install common tools
   ansible.builtin.apt:
diff --git a/ansible/roles/hashicorp-apt/tasks/main.yml b/ansible/roles/hashicorp-apt/tasks/main.yml
index 3ad6e98..4259153 100644
--- a/ansible/roles/hashicorp-apt/tasks/main.yml
+++ b/ansible/roles/hashicorp-apt/tasks/main.yml
@@ -1,12 +1,46 @@
 ---
-- name: Add hashicorp GPG key
-  become: true
-  apt_key:
-    url: https://apt.releases.hashicorp.com/gpg
-    state: present
+#- name: Add hashicorp GPG key
+#  become: true
+#  apt_key:
+#    url: https://apt.releases.hashicorp.com/gpg
+#    state: present
+#
+#- name: Add hashicorp repository
+#  become: true
+#  apt_repository:
+#    repo: deb [arch=amd64] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main
+#    state: present
 
-- name: Add hashicorp repository
+#- name: Add Vault/Hashicorp apt key
+#  apt_key:
+#    url: "https://apt.releases.hashicorp.com/gpg"
+#    state: present
+#  become: true
+#  when: ansible_pkg_mgr == 'apt'
+#
+#- name: Add Vault/Hashicorp apt repo
+#  apt_repository:
+#    repo: "deb https://apt.releases.hashicorp.com/gpg {{ ansible_distribution_release }} main"
+#    state: present
+#  become: true
+#  when: ansible_pkg_mgr == 'apt'
+
+- name: Add Hashicorp apt key
   become: true
-  apt_repository:
-    repo: deb [arch=amd64] https://apt.releases.hashicorp.com {{ ansible_distribution_release }} main
-    state: present
+  shell:
+    cmd: "curl -fsSL https://apt.releases.hashicorp.com/gpg | sudo apt-key add -"
+  register: result
+
+- name: Print out result
+  debug:
+    msg: "{{ result.stdout }}"
+
+- name: Add Hashicorp repository
+  become: true
+  shell:
+    cmd: 'sudo apt-add-repository "deb [arch=amd64] https://apt.releases.hashicorp.com $(lsb_release -cs) main"'
+  register: result
+
+- name: Print out results
+  debug:
+    msg: "{{ result.stdout }}"