From 9eca84fc249756d31b909cda443da9a1b3ba1bb1 Mon Sep 17 00:00:00 2001
From: Ben Vincent <ben@unkin.net>
Date: Sun, 30 Mar 2025 18:36:41 +1100
Subject: [PATCH] feat: cleanup consul from url install

- set bind_dir to be /usr/bin for rhel, /usr/local/bin for debian
- remove url-installed consul from rhel
---
 hieradata/common.yaml                    | 1 +
 hieradata/os/Debian/all_releases.yaml    | 1 +
 site/profiles/manifests/consul/client.pp | 6 ++++++
 3 files changed, 8 insertions(+)

diff --git a/hieradata/common.yaml b/hieradata/common.yaml
index d2871a5..ecd78e5 100644
--- a/hieradata/common.yaml
+++ b/hieradata/common.yaml
@@ -167,6 +167,7 @@ profiles::base::puppet_servers:
 
 consul::install_method: 'package'
 consul::manage_repo: false
+consul::bin_dir: /usr/bin
 
 profiles::dns::master::basedir: '/var/named/sources'
 profiles::dns::base::ns_role: 'roles::infra::dns::resolver'
diff --git a/hieradata/os/Debian/all_releases.yaml b/hieradata/os/Debian/all_releases.yaml
index 0caa1b1..efd71f9 100644
--- a/hieradata/os/Debian/all_releases.yaml
+++ b/hieradata/os/Debian/all_releases.yaml
@@ -16,3 +16,4 @@ networking::nwmgr_dns_none: false
 
 consul::install_method: 'url'
 consul::manage_repo: false
+consul::bin_dir: /usr/local/bin
diff --git a/site/profiles/manifests/consul/client.pp b/site/profiles/manifests/consul/client.pp
index d1d82d8..fa229c8 100644
--- a/site/profiles/manifests/consul/client.pp
+++ b/site/profiles/manifests/consul/client.pp
@@ -85,4 +85,10 @@ class profiles::consul::client (
     require => File['/root/.config'],
   }
 
+  # cleanup /usr/local/bin/consul which was created by url install method
+  if $facts['os']['family'] == 'RedHat' {
+    file {'/usr/local/bin/consul':
+      ensure  => absent,
+    }
+  }
 }
-- 
2.47.3