diff options
author | 2016-09-08 00:30:24 +0800 | |
---|---|---|
committer | 2016-09-08 00:30:24 +0800 | |
commit | 23f466831a8284433609e9f770737830d0b448bf (patch) | |
tree | 10c1d23a845026a0499b9a011b5ca30e3883de54 /tosca2heat/heat-translator/translator/tests/data/hot_output | |
parent | fa544e8fbbf3b8d5cfe0dc82090f0de6d7599524 (diff) |
Emergence merged for unit test.
Reversed merged caused the unit test error, i think this
is the ci system's bug.
Change-Id: I6d29f7f11cc0a78c695f179aa30c93545a575584
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests/data/hot_output')
-rw-r--r-- | tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml index 26864a6..b8cc518 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml @@ -474,8 +474,6 @@ outputs: get_attr: - MM_Active_Host - networks - - private - - 0 private_ip_of_CM: description: The private IP address of the CM. @@ -483,8 +481,6 @@ outputs: get_attr: - CM_Active_Host - networks - - private - - 0 private_ip_of_DM: description: The private IP address of the DM. @@ -492,8 +488,6 @@ outputs: get_attr: - DM_Host - networks - - private - - 0 private_ip_of_LB: description: The private IP address of the LB. @@ -501,5 +495,3 @@ outputs: get_attr: - LB_Host - networks - - private - - 0 |