Merge "per_node is not parsing generated json" into stable/victoria

This commit is contained in:
Zuul 2021-02-15 23:11:56 +00:00 committed by Gerrit Code Review
commit bf71a052d3
1 changed files with 10 additions and 2 deletions

View File

@ -45,18 +45,26 @@ resources:
# the data of the NodeDataLookup parameter that matches the
# system UUID
echo $node_lookup | $(get_python) -c "
import ast
import json
import sys
input = sys.stdin.readline() or '{}'
cnt = json.loads(input)
try:
cnt = json.loads(input)
except json.decoder.JSONDecodeError:
cnt = ast.literal_eval(input)
print(json.dumps(cnt.get('${node_id}', {})))
" > /etc/puppet/hieradata/${node_id}.json
# handle upper case node id LP#1816652
echo $node_lookup | $(get_python) -c "
import ast
import json
import sys
input = sys.stdin.readline() or '{}'
cnt = json.loads(input)
try:
cnt = json.loads(input)
except json.decoder.JSONDecodeError:
cnt = ast.literal_eval(input)
print(json.dumps(cnt.get('${node_id_upper}', {})))
" > /etc/puppet/hieradata/${node_id_upper}.json