Merge "Update NodeDataLookup examples to use JSON instead of strings"

doc/source/install/advanced_deployment/ceph_config.rst

@@ -322,33 +322,25 @@ An example of what the `~/my-node-settings.yaml` file, as described in
 will keep using filestore is the following::
 
   parameter_defaults:
-    NodeDataLookup: |
-    {
-      "00000000-0000-0000-0000-0CC47A6EFDCC": {
-        "devices": [
-          "/dev/sdb",
-          "/dev/sdc"
-        ],
-        "dedicated_devices": [
-          "/dev/nvme0n1",
-          "/dev/nvme0n1"
-        ],
-        "osd_scenario": "non-collocated",
-        "osd_objectstore": "filestore"
-      },
-      "00000000-0000-0000-0000-0CC47A6F13FF": {
-        "devices": [
-          "/dev/sdb",
-          "/dev/sdc"
-        ],
-        "dedicated_devices": [
-          "/dev/nvme0n1",
-          "/dev/nvme0n1"
-        ],
-        "osd_scenario": "non-collocated",
-        "osd_objectstore": "filestore"
-      }
-    }
+    NodeDataLookup:
+      00000000-0000-0000-0000-0CC47A6EFDCC:
+        devices:
+          - /dev/sdb
+          - /dev/sdc
+        dedicated_devices:
+          - /dev/nvme0n1
+          - /dev/nvme0n1
+        osd_scenario: non-collocated
+        osd_objectstore: filestore
+      00000000-0000-0000-0000-0CC47A6F13FF:
+        devices:
+          - /dev/sdb
+          - /dev/sdc
+        dedicated_devices:
+          - /dev/nvme0n1
+          - /dev/nvme0n1
+        osd_scenario: non-collocated
+        osd_objectstore: filestore
 
 Be sure to set every existing Ceph filestore server to the filestore
 parameters by its machine unique UUID. If the above is not done and

doc/source/install/advanced_deployment/node_specific_hieradata.rst

@@ -44,8 +44,7 @@ or puppet-ceph (Ocata and older).
 For ceph-ansible use::
 
   parameter_defaults:
-    NodeDataLookup: |
-      {"32e87b4c-c4a7-41be-865b-191684a6883b": {"devices": ["/dev/sdc"]}}
+    NodeDataLookup: {"32e87b4c-c4a7-41be-865b-191684a6883b": {"devices": ["/dev/sdc"]}}
 
 For puppet-ceph use::
 
@@ -53,8 +52,7 @@ For puppet-ceph use::
     OS::TripleO::CephStorageExtraConfigPre: /path/to/tripleo-heat-templates/puppet/extraconfig/pre_deploy/per_node.yaml
 
   parameter_defaults:
-    NodeDataLookup: |
-      {"32e87b4c-c4a7-41be-865b-191684a6883b": {"ceph::profile::params::osds": {"/dev/sdc": {}}}}
+    NodeDataLookup: {"32e87b4c-c4a7-41be-865b-191684a6883b": {"ceph::profile::params::osds": {"/dev/sdc": {}}}}
 
 In the above example we're customizing only a single key for a single node, but
 the structure is that of a UUID-mapped hash so it is possible to customize