From 7bcc6e86f1fc1732b073a301d8fe0f6a4de0f642 Mon Sep 17 00:00:00 2001 From: John Fulton Date: Fri, 15 Dec 2017 14:27:08 -0500 Subject: [PATCH] Update node-specfic data doc to cover ceph-ansible usage Change-Id: I36d752132f36af947dca025915724d9e192ec161 Related-Bug: #1736707 --- .../node_specific_hieradata.rst | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/doc/source/install/advanced_deployment/node_specific_hieradata.rst b/doc/source/install/advanced_deployment/node_specific_hieradata.rst index 39b647c8..dc9fd66c 100644 --- a/doc/source/install/advanced_deployment/node_specific_hieradata.rst +++ b/doc/source/install/advanced_deployment/node_specific_hieradata.rst @@ -36,9 +36,18 @@ Ironic node UUID. For the next step, we'll assume the output was Creating the Heat environment file ---------------------------------- -Assuming we want to use `/dev/sdc` as data disk for `ceph-osd` on our target -node, we'll create a yaml file looking like the following -(eg. `my-node-settings.yaml`):: +Assuming we want to use `/dev/sdc` as a data disk for `ceph-osd` on our target +node, we'll create a yaml file, e.g. `my-node-settings.yaml`, with the +following content depending on if either ceph-ansible (Pike and newer) +or puppet-ceph (Ocata and older). + +For ceph-ansible use:: + + parameter_defaults: + NodeDataLookup: | + {"32E87B4C-C4A7-418E-865B-191684A6883B": {"devices": ["/dev/sdc"]}} + +For puppet-ceph use:: resource_registry: OS::TripleO::CephStorageExtraConfigPre: /path/to/tripleo-heat-templates/puppet/extraconfig/pre_deploy/per_node.yaml