openstack
/
tripleo-docs
Code Issues Proposed changes

Update NodeDataLookup examples to use JSON instead of strings 

The changes introduced to resolve bug 1814070 assume NodeDataLookup
to be a real JSON object instead of a string. This updates our
examples in the docs.

Change-Id: I116fd249b4330ac9992428a1c77409a7376a1d73
This commit is contained in:
Giulio Fidente 2019-02-06 17:20:10 +01:00
parent 566efcd81e
commit e070db531f
2 changed files with 21 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
doc/source/install/advanced_deployment/ceph_config.rst
View File

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

6
doc/source/install/advanced_deployment/node_specific_hieradata.rst
View File

@ -44,8 +44,7 @@ or puppet-ceph (Ocata and older).
For ceph-ansible use:: For ceph-ansible use::
parameter_defaults: parameter_defaults:
NodeDataLookup: | NodeDataLookup: {"32e87b4c-c4a7-41be-865b-191684a6883b": {"devices": ["/dev/sdc"]}}
{"32e87b4c-c4a7-41be-865b-191684a6883b": {"devices": ["/dev/sdc"]}}
For puppet-ceph use:: 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 OS::TripleO::CephStorageExtraConfigPre: /path/to/tripleo-heat-templates/puppet/extraconfig/pre_deploy/per_node.yaml
parameter_defaults: parameter_defaults:
NodeDataLookup: | NodeDataLookup: {"32e87b4c-c4a7-41be-865b-191684a6883b": {"ceph::profile::params::osds": {"/dev/sdc": {}}}}
{"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 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 the structure is that of a UUID-mapped hash so it is possible to customize