From 33ec66346bc84d5d90f1eeae1c71f4cae6c7e42e Mon Sep 17 00:00:00 2001
From: Ian Fijolek <ian@iamthefij.com>
Date: Tue, 9 May 2023 11:39:27 -0700
Subject: [PATCH] Make target to stop Nomad cluster

---
 Makefile                           | 20 +++++++-------------
 ansible_playbooks/stop-cluster.yml | 20 --------------------
 2 files changed, 7 insertions(+), 33 deletions(-)

diff --git a/Makefile b/Makefile
index a458624..273089c 100644
--- a/Makefile
+++ b/Makefile
@@ -59,24 +59,18 @@ ansible-cluster: $(VENV) ansible_galaxy
 		./ansible_playbooks/setup-cluster.yml
 
 .PHONY: bootstrap-values
-bootstrap-values: $(VENV) ansible_galaxy
-	env VIRTUAL_ENV=$(VENV) $(VENV)/bin/ansible-playbook -vv \
-		-e "@vault-keys.json" \
-		./ansible_playbooks/bootstrap-values.yml
-
-.PHONY: recover-consul
-recover-consul: $(VENV)
-	$(VENV)/bin/ansible-playbook -K ./ansible_playbooks/recover-consul.yaml
+bootstrap-values: $(VENV)
+	env NOMAD_ADDR=192.168.2.101 \
+		NOMAD_TOKEN=$(shell jq -r .SecretID nomad_bootstrap.json) \
+		$(VENV)/bin/python ./nomad_vars.py
 
 .PHONY: recover-nomad
 recover-nomad: $(VENV)
 	$(VENV)/bin/ansible-playbook -K ./ansible_playbooks/recover-nomad.yaml
 
-.PHONY: unseal-vault
-unseal-vault: $(VENV)
-	env VIRTUAL_ENV=$(VENV) $(VENV)/bin/ansible-playbook -vv \
-		-e "@vault-keys.json" \
-		./ansible_playbooks/unseal-vault.yml
+.PHONY: stop-cluster
+stop-cluster: $(VENV)
+	$(VENV)/bin/ansible-playbook -K ./ansible_playbooks/stop-cluster.yml
 
 .PHONY: init
 init:
diff --git a/ansible_playbooks/stop-cluster.yml b/ansible_playbooks/stop-cluster.yml
index 0570472..7660d80 100644
--- a/ansible_playbooks/stop-cluster.yml
+++ b/ansible_playbooks/stop-cluster.yml
@@ -8,23 +8,3 @@
         name: nomad
         state: stopped
       become: true
-
-- name: Stop Vault
-  hosts: nomad_instances
-
-  tasks:
-    - name: Stop Vault
-      systemd:
-        name: vault
-        state: stopped
-      become: true
-
-- name: Stop Consul
-  hosts: consul_instances
-
-  tasks:
-    - name: Stop Consul
-      systemd:
-        name: consul
-        state: stopped
-      become: true