openstack/tripleo-docs
Code Issues Proposed changes

Merge "Update references to overcloud-resource-registry-puppet.j2.yaml in docs"

Browse Source
This commit is contained in:
Jenkins 2016-12-07 06:35:56 +00:00 committed by Gerrit Code Review
commit bf133baafc
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
doc/source/advanced_deployment/template_deploy.rst
View File

@ -31,7 +31,7 @@ templates.
The mapping between heat resource types and the underlying templates can be
found in
`/usr/share/\
openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.yaml`
openstack-tripleo-heat-templates/overcloud-resource-registry-puppet.j2.yaml`
Here is an example of copying a specific resource template and overriding
so the deployment uses the local version::

6
doc/source/developer/tht_walkthrough/changes-tht.rst
View File

@ -76,11 +76,11 @@ The updated .pp files for the NTP example were:
Step 2 - overcloud-resource-registry-puppet.yaml resource registry changes
Step 2 - overcloud-resource-registry-puppet.j2.yaml resource registry changes
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The resource ``OS::TripleO::Services::Ntp`` must be defined in the resource
registry (``overcloud-resource-registry-puppet.yaml``)
registry (``overcloud-resource-registry-puppet.j2.yaml``)
Create a new resource type alias which references the per-service
heat template file, as described above.
@ -196,4 +196,4 @@ configured.
If it is needed, the templates can be decomposed to remove
duplicated parameters among different deployment environments
(i.e. using pacemaker). To do this see
section :ref:`duplicated-parameters`.
section :ref:`duplicated-parameters`.