From 91e3f2d42730f860f8c1f824f6d92ba0809d9997 Mon Sep 17 00:00:00 2001 From: Ben Vincent Date: Sat, 1 Jun 2024 12:04:57 +1000 Subject: [PATCH] chore: change node_lookup to use consul - remove https, use http backend as no authentication is required --- site/profiles/templates/helpers/node_lookup.erb | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/site/profiles/templates/helpers/node_lookup.erb b/site/profiles/templates/helpers/node_lookup.erb index 248f3e7..7157f76 100644 --- a/site/profiles/templates/helpers/node_lookup.erb +++ b/site/profiles/templates/helpers/node_lookup.erb @@ -24,16 +24,8 @@ def build_query(node=None, fact_name=None, match=None, show_role=False): return json.dumps(["and"] + query_filters) def query_puppetdb(query): - # Determine the correct SSL certificate path based on the OS - if os.path.exists('/etc/ssl/certs/ca-certificates.crt'): # Debian/Ubuntu - cert_path = '/etc/ssl/certs/ca-certificates.crt' - elif os.path.exists('/etc/pki/tls/cert.pem'): # RHEL/CentOS - cert_path = '/etc/pki/tls/cert.pem' - else: - raise FileNotFoundError("SSL certificate file not found.") - - url = 'https://puppetdbapi.main.unkin.net/pdb/query/v4/facts' - response = requests.get(url, params={'query': query}, verify=cert_path) + url = 'http://puppetdbapi.service.consul:8080/pdb/query/v4/facts' + response = requests.get(url, params={'query': query}) process_response(response) def process_response(response):