diff options
author | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-09 02:16:12 +0800 |
---|---|---|
committer | shangxdy <shang.xiaodong@zte.com.cn> | 2016-09-09 02:16:12 +0800 |
commit | f90be03da41fa8a233ecc84f54fa59d1f2f7021f (patch) | |
tree | cb8bd692a493e87fbf61770cba9c3b61ecdf6788 /tosca2heat/heat-translator/translator/tests/data/hot_output/network | |
parent | eaecb94d4361de61a4f276175b8c8099f37a4628 (diff) |
Add property of software_config_transport in compute node
According to hot syntax, when deploy software into compute, it shall
include software_config_transport property in server resource, because
the openstack environment configuration may not support the default
value. so the software_config_transport shall be specified.
JIRA:PARSER-105
Change-Id: Iefe50400ae2008214bb8cb98dde719130553b3bf
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests/data/hot_output/network')
5 files changed, 6 insertions, 0 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml index 556dcf4..a2f1e4a 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_custom_network_nodes.yaml @@ -13,6 +13,7 @@ resources: networks: - port: { get_resource: CP1 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT CP1: type: OS::Neutron::Port properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml index cfcd290..67653e6 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_one_network.yaml @@ -18,6 +18,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml index f8674e1..81f69d1 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_one_server_three_networks.yaml @@ -16,6 +16,7 @@ resources: - port: { get_resource: my_port2 } - port: { get_resource: my_port3 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network1: type: OS::Neutron::Net diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml index b8282b5..5b04831 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_server_on_existing_network.yaml @@ -18,6 +18,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_port: type: OS::Neutron::Port diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml index 21157bb..64fc008 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/network/hot_two_servers_one_network.yaml @@ -30,6 +30,7 @@ resources: networks: - port: { get_resource: my_port } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_server2: type: OS::Nova::Server @@ -39,6 +40,7 @@ resources: networks: - port: { get_resource: my_port2 } user_data_format: SOFTWARE_CONFIG + software_config_transport: POLL_SERVER_HEAT my_network: type: OS::Neutron::Net |