From: Steven Wright Date: Mon, 16 Oct 2017 14:06:36 +0000 (+0000) Subject: Merge "VNFRQTS -Requirements fix code-block" X-Git-Tag: 2.0.0-ONAP~97 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=987e0be683fc375513b2297d974f6bf903beb12d;p=vnfrqts%2Frequirements.git Merge "VNFRQTS -Requirements fix code-block" --- 987e0be683fc375513b2297d974f6bf903beb12d diff --cc docs/Chapter5.rst index 2c37fb2,b7039f2..1d20c94 --- a/docs/Chapter5.rst +++ b/docs/Chapter5.rst @@@ -1576,27 -1576,27 +1576,27 @@@ Heat Orchestration template structure f defined by OpenStack at https://docs.openstack.org/developer/heat/template_guide/hot_spec.html. - .. code-block:: python + .. code-block:: yaml - heat_template_version: - - description: - # a description of the template - - parameter_groups: - # a declaration of input parameter groups and order - - parameters: - # declaration of input parameters - - resources: - # declaration of template resources - - outputs: - # declaration of output parameters - - conditions: - # declaration of conditions + heat_template_version: + + description: + # a description of the template + + parameter_groups: + # a declaration of input parameter groups and order + + parameters: + # declaration of input parameters + + resources: + # declaration of template resources + + outputs: + # declaration of output parameters + + conditions: + # declaration of conditions Heat Orchestration templates for ONAP must contain the following @@@ -3499,10 -3499,10 +3499,10 @@@ The parameter must not be enumerated i *Example Parameter Definition* - .. code-block:: python + .. code-block:: yaml parameters: - + {vm-type}_{network-role}_ips: type: comma_delimited_list description: Fixed IPv4 assignments for {vm-type} VMs on the {Network-role} network