diff options
| -rw-r--r-- | docs/Chapter5/Heat.rst | 21 | ||||
| -rw-r--r-- | docs/Chapter8/Ansible-JSON-Key-Value-Description.rst | 18 |
2 files changed, 12 insertions, 27 deletions
diff --git a/docs/Chapter5/Heat.rst b/docs/Chapter5/Heat.rst index cf2be08..646aa2b 100644 --- a/docs/Chapter5/Heat.rst +++ b/docs/Chapter5/Heat.rst @@ -7083,16 +7083,6 @@ module, the scope of volume templates must be 1:1 with Base module or Incremental module. A single volume module must create only the volumes required by a single Incremental module or Base module. - -.. req:: - :id: R-47788 - :target: VNF - :keyword: MUST - - The VNF Heat Orchestration Template **MUST** have a 1:1 - scope of a cinder volume module, when it exists, with the - Base Module or Incremental Module. - As stated in R-11200, a VNF's Cinder Volume Module, when it exists, **MUST** be 1:1 with a Base module or Incremental module. That is, A single volume module must create only the volumes required by a @@ -7361,15 +7351,8 @@ Incremental Module, and Cinder Volume Module may use nested heat. A VNF's Heat Orchestration Template **MUST** have no more than two levels of nesting. -.. req:: - :id: R-70112 - :target: VNF - :keyword: MUST - - A VNF's Heat Orchestration Template **MUST** - reference a Nested YAML file by name. - The use of 'resource_registry' in the VNF's Heat Orchestration - Templates Environment File **MUST NOT** be used. +As stated in R-67231 a VNF's Heat Orchestration template's +Environment File's **MUST NOT** contain the "resource_registry:" section. Two levels of nesting is defined as follows: A base module, incremental module, or cinder volume module references a nested heat file either diff --git a/docs/Chapter8/Ansible-JSON-Key-Value-Description.rst b/docs/Chapter8/Ansible-JSON-Key-Value-Description.rst index 4eb8131..4fd051c 100644 --- a/docs/Chapter8/Ansible-JSON-Key-Value-Description.rst +++ b/docs/Chapter8/Ansible-JSON-Key-Value-Description.rst @@ -79,21 +79,23 @@ Table B1. Ansible JSON File key value description Ansible JSON file example: -{ +.. code-block:: json - “Action”:”Configure”, + { - "PlaybookName": "<VNFCode>/<Version>/ansible/configure/site.yml", + “Action”:”Configure”, - "NodeList": ["test1.vnf\_b.onap.com", “test2.vnf\_b.onap.com”], + "PlaybookName": "<VNFCode>/<Version>/ansible/configure/site.yml", - "Timeout": 60, + "NodeList": ["test1.vnf\_b.onap.com", “test2.vnf\_b.onap.com”], - "EnvParameters": {"Retry": 3, "Wait": 5, “ConfigFile”:”config.txt”}, + "Timeout": 60, - “FileParameters”:{“config.txt”:”db\_ip=10.1.1.1, sip\_timer=10000”} + "EnvParameters": {"Retry": 3, "Wait": 5, “ConfigFile”:”config.txt”}, -} + “FileParameters”:{“config.txt”:”db\_ip=10.1.1.1, sip\_timer=10000”} + + } In the above example, the Ansible Server will: |