unkin/puppet-prod
2
0
Fork 0
Code Issues 10 Pull Requests Actions Packages Projects Releases Wiki Activity

promote develop to master #6

Merged
unkinben merged 449 commits from develop into master 2024-06-01 14:48:48 +10:00
Conversation 0 Commits 449 Files Changed 291 +2 -10
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 91e3f2d427 - Show all commits

12
site/profiles/templates/helpers/node_lookup.erb
View File

@ -24,16 +24,8 @@ def build_query(node=None, fact_name=None, match=None, show_role=False):
return json.dumps(["and"] + query_filters) return json.dumps(["and"] + query_filters)
def query_puppetdb(query): def query_puppetdb(query):
# Determine the correct SSL certificate path based on the OS url = 'http://puppetdbapi.service.consul:8080/pdb/query/v4/facts'
if os.path.exists('/etc/ssl/certs/ca-certificates.crt'): # Debian/Ubuntu response = requests.get(url, params={'query': query})
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)
process_response(response) process_response(response)
def process_response(response): def process_response(response):