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 -3
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit f79d9de495 - Show all commits

1
hieradata/common.yaml
View File

@ -126,7 +126,6 @@ profiles::base::hosts::additional_hosts:
hostname: prodinf01n04.main.unkin.net hostname: prodinf01n04.main.unkin.net
aliases: aliases:
- prodinf01n04 - prodinf01n04
- puppetdb
- ip: 198.18.17.5 - ip: 198.18.17.5
hostname: prodinf01n05.main.unkin.net hostname: prodinf01n05.main.unkin.net
aliases: aliases:

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

@ -23,8 +23,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):
url = 'http://puppetdb:8080/pdb/query/v4/facts' url = 'https://puppetdbapi.main.unkin.net/pdb/query/v4/facts'
response = requests.get(url, params={'query': query}) response = requests.get(url, params={'query': query}, verify='/etc/pki/tls/cert.pem')
process_response(response) process_response(response)
def process_response(response): def process_response(response):