Merge "VNFRQTS -Requirements fix code-block"
authorSteven Wright <sw3588@att.com>
Mon, 16 Oct 2017 14:06:36 +0000 (14:06 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 16 Oct 2017 14:06:36 +0000 (14:06 +0000)
1  2 
docs/Chapter4.rst
docs/Chapter5.rst

Simple merge
@@@ -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: <date>                       
 -                                                       
 - 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: <date>
 +
 + 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