Browse Source

Change NodeDataLookup type from string to json

The NodeDataLookup parameter should be valid JSON and we should
help the user by adding type checking for this early in the
deployment so that the user doesn't experience the related bug.

Change-Id: Id9d2208f1cbaba9234d7657420cd7efcad3507a0
Related-Bug: #1784967
Related-Bug: #1814070
(cherry picked from commit fe2fda491b)
tags/9.3.0
John Fulton 9 months ago
parent
commit
65111909cc

+ 3
- 3
docker/services/ceph-ansible/ceph-base.yaml View File

@@ -39,9 +39,9 @@ parameters:
39 39
     - allowed_values: ['', 'UPGRADE', 'FASTFORWARDUPGRADE']
40 40
     default: ''
41 41
   NodeDataLookup:
42
-    type: string
43
-    default: '{}'
44
-    description: json string containing per-node configuration map
42
+    type: json
43
+    default: {}
44
+    description: json containing per-node configuration map
45 45
   DeploymentServerBlacklist:
46 46
     default: []
47 47
     type: comma_delimited_list

+ 4
- 4
puppet/extraconfig/pre_deploy/per_node.yaml View File

@@ -12,13 +12,13 @@ parameters:
12 12
   # to the json required for the node-specific hieradata
13 13
   # Note this needs to be a json blob e.g:
14 14
   #      parameter_defaults:
15
-  #        NodeDataLookup: |
15
+  #        NodeDataLookup:
16 16
   #          {"AB4114B1-9C9D-409A-BEFB-D88C151BF2C3": {"foo": "bar"},
17 17
   #           "8CF1A7EA-7B4B-4433-AC83-17675514B1B8": {"foo2": "bar2"}}
18 18
   NodeDataLookup:
19
-    type: string
20
-    default: '{}'
21
-    description: json string containing per-node configuration map
19
+    type: json
20
+    default: {}
21
+    description: json containing per-node configuration map
22 22
 
23 23
 resources:
24 24
   NodeSpecificConfig:

+ 7
- 0
releasenotes/notes/node_data_lookup_string_to_json-69362e93d862bd87.yaml View File

@@ -0,0 +1,7 @@
1
+---
2
+deprecations:
3
+  - |
4
+    The NodeDataLookup parameter type was changed from string to json
5
+fixes:
6
+  - |
7
+    - Bug 1784967 invalid JSON in NodeDataLookup error message should be more helpful

Loading…
Cancel
Save