Escape single quotes and allow for any character in node description

This commit is contained in:
William Wernert
2021-10-22 15:28:37 -04:00
parent d5d970672d
commit 6e34905b42
2 changed files with 2 additions and 2 deletions

View File

@@ -17,7 +17,7 @@
"agent": { "agent": {
"nodeId": "{{ grains.host | lower }}", "nodeId": "{{ grains.host | lower }}",
"role": "{{ grains.role }}", "role": "{{ grains.role }}",
"description": "{{ DESCRIPTION }}", "description": {{ DESCRIPTION | tojson }},
"address": "{{ ADDRESS }}", "address": "{{ ADDRESS }}",
"model": "{{ MODEL }}", "model": "{{ MODEL }}",
"pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }}, "pollIntervalMs": {{ CHECKININTERVALMS if CHECKININTERVALMS else 10000 }},

View File

@@ -1509,7 +1509,7 @@ host_pillar() {
" mainint: '$MNIC'"\ " mainint: '$MNIC'"\
"sensoroni:"\ "sensoroni:"\
" node_address: '$MAINIP'"\ " node_address: '$MAINIP'"\
" node_description: '$NODE_DESCRIPTION'"\ " node_description: '${NODE_DESCRIPTION//\'/''}'"\
"" > "$pillar_file" "" > "$pillar_file"
} }