diff options
| author |   julien zhang <zhang.jun3g@zte.com.cn> | 2016-08-22 13:54:03 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@172.30.200.206> | 2016-08-22 13:54:03 +0000 |
| commit | 1a9b3ea86e026115938b1872ac1fc3bce30055ed (patch) | |
| tree | 332c087457d939b050ff2445c17fdd9c66a6a7e0 | |
| parent | c56ae30d45407c8e71eeb19322d1c9167ef8d60e (diff) | |
| parent | 1a0bd86750c00b06b2161426c5154dee557c3e70 (diff) | |
Merge "Remove the cyclic dependencies in vRNC definition"
| -rw-r--r-- | docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml | 3 | ||||
| -rw-r--r-- | tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml index 83283f3..281b064 100644 --- a/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml +++ b/docs/parser_docs/tosca2heat/examples/Simple_RNC.yaml @@ -96,7 +96,6 @@ topology_template: - local_storage: node: MM_BlockStorage relationship: Storage_attachesto - - high_availability: MM_Passive artifacts: #the VM image of MM vm_image: mm.image @@ -149,8 +148,6 @@ topology_template: min_instances: 1 max_instances: 126 default_instances: 1 - requirements: - - high_availability: CM_Passive artifacts: #the VM image of CM vm_image: cm.image diff --git a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml index 7068c7a..a134e3c 100644 --- a/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml +++ b/tosca2heat/tosca-parser/toscaparser/extensions/nfv/tests/data/vRNC/Definitions/vRNC.yaml @@ -120,7 +120,6 @@ topology_template: - local_storage: node: MM_BlockStorage relationship: Storage_attachesto - - high_availability: MM_Passive artifacts: #the VM image of MM vm_image: mm.image @@ -184,8 +183,6 @@ topology_template: min_instances: 1 max_instances: 12 default_instances: 1 - requirements: - - high_availability: CM_Passive artifacts: #the VM image of CM vm_image: cm.image |