summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorshangxdy <shang.xiaodong@zte.com.cn>2016-09-12 15:18:46 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-09-12 15:18:46 +0000
commit164b3a8c65b4b9c8d8108a72ec63a0dedabee190 (patch)
tree08f4b5d4dd28fe63716eebac4dbafa244b49c3af
parent77a4e2bc3774ba556175253528da139fd28489d5 (diff)
parent708b2e982476a55e7f9b8b3e2f0cc0daa5dc78a5 (diff)
Merge "Add signal_transport in software deployment resource" into stable/colorado
-rw-r--r--tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py9
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml2
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml2
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml1
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml1
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml23
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml23
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml2
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml1
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml6
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml2
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml7
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml6
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml8
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml8
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml2
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_vRNC.yaml12
-rw-r--r--tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml4
18 files changed, 116 insertions, 3 deletions
diff --git a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py
index 8994c63..7b83906 100644
--- a/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py
+++ b/tosca2heat/heat-translator/translator/hot/syntax/hot_resource.py
@@ -154,12 +154,14 @@ class HotResource(object):
self.type = 'OS::Heat::SoftwareDeployment'
self.properties = {'config': {'get_resource': config_name},
'server': {'get_resource':
- hosting_on_server}}
+ hosting_on_server},
+ 'signal_transport': 'HEAT_SIGNAL'}
deploy_lookup[operation] = self
else:
sd_config = {'config': {'get_resource': config_name},
'server': {'get_resource':
- hosting_on_server}}
+ hosting_on_server},
+ 'signal_transport': 'HEAT_SIGNAL'}
deploy_resource = \
HotResource(self.nodetemplate,
deploy_name,
@@ -221,7 +223,8 @@ class HotResource(object):
deploy_name = tosca_source.name + '_' + tosca_target.name + \
'_connect_deploy'
sd_config = {'config': {'get_resource': self.name},
- 'server': {'get_resource': hosting_server.name}}
+ 'server': {'get_resource': hosting_server.name},
+ 'signal_transport': 'HEAT_SIGNAL'}
deploy_resource = \
HotResource(self.nodetemplate,
deploy_name,
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml
index e0b6ea7..dd6a234 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_artifact.yaml
@@ -15,6 +15,8 @@ resources:
get_file: http://www.mycompany.org/content.tgz
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
+
server:
type: OS::Nova::Server
properties:
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml
index f451560..f60a1bb 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type.yaml
@@ -19,6 +19,8 @@ resources:
get_param: install_path
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
+
server:
type: OS::Nova::Server
properties:
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml
index 0cd9586..f973f58 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_override.yaml
@@ -19,6 +19,7 @@ resources:
get_param: install_path
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
server:
type: OS::Nova::Server
properties:
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml
index fed922d..b1ce63c 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_custom_type_with_param_override.yaml
@@ -19,6 +19,7 @@ resources:
get_param: install_path
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
server:
type: OS::Nova::Server
properties:
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml
index 1cc4f56..debbcf7 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk.yaml
@@ -32,6 +32,7 @@ resources:
get_resource: nodejs_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
nodejs_create_config:
type: OS::Heat::SoftwareConfig
@@ -54,6 +55,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- nodejs_create_deploy
- mongo_db_create_deploy
@@ -72,6 +74,7 @@ resources:
get_resource: paypal_pizzastore_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- paypal_pizzastore_configure_deploy
@@ -90,6 +93,7 @@ resources:
get_resource: mongo_dbms_create_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
mongo_dbms_create_config:
type: OS::Heat::SoftwareConfig
@@ -110,6 +114,7 @@ resources:
- networks
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_create_deploy
@@ -127,6 +132,7 @@ resources:
get_resource: mongo_dbms_start_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_configure_deploy
@@ -144,6 +150,7 @@ resources:
get_resource: mongo_db_create_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_start_deploy
@@ -162,6 +169,7 @@ resources:
get_resource: app_collectd_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_start_deploy
@@ -184,6 +192,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_collectd_create_deploy
@@ -201,6 +210,7 @@ resources:
get_resource: app_collectd_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_collectd_configure_deploy
@@ -218,6 +228,7 @@ resources:
get_resource: app_collectd_logstash_connect_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -236,6 +247,7 @@ resources:
get_resource: app_rsyslog_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_start_deploy
@@ -253,6 +265,7 @@ resources:
get_resource: app_rsyslog_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_rsyslog_configure_deploy
@@ -275,6 +288,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_rsyslog_create_deploy
@@ -292,6 +306,7 @@ resources:
get_resource: app_rsyslog_logstash_connect_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -310,6 +325,7 @@ resources:
get_resource: logstash_create_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- elasticsearch_start_deploy
@@ -327,6 +343,7 @@ resources:
get_resource: logstash_start_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -349,6 +366,7 @@ resources:
- networks
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -367,6 +385,7 @@ resources:
get_resource: elasticsearch_create_config
server:
get_resource: elasticsearch_server
+ signal_transport: HEAT_SIGNAL
elasticsearch_create_config:
type: OS::Heat::SoftwareConfig
@@ -382,6 +401,7 @@ resources:
get_resource: elasticsearch_start_config
server:
get_resource: elasticsearch_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- elasticsearch_create_deploy
@@ -400,6 +420,7 @@ resources:
get_resource: kibana_create_config
server:
get_resource: kibana_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- elasticsearch_start_deploy
@@ -426,6 +447,7 @@ resources:
- networks
server:
get_resource: kibana_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- kibana_create_deploy
@@ -443,6 +465,7 @@ resources:
get_resource: kibana_start_config
server:
get_resource: kibana_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- kibana_configure_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml
index 2a1bf76..28ac520 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_elk_from_csar.yaml
@@ -32,6 +32,7 @@ resources:
get_resource: nodejs_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
nodejs_create_config:
type: OS::Heat::SoftwareConfig
@@ -55,6 +56,7 @@ resources:
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- nodejs_create_deploy
- mongo_db_create_deploy
@@ -73,6 +75,7 @@ resources:
get_resource: paypal_pizzastore_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- paypal_pizzastore_configure_deploy
@@ -91,6 +94,7 @@ resources:
get_resource: mongo_dbms_create_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
mongo_dbms_create_config:
type: OS::Heat::SoftwareConfig
@@ -112,6 +116,7 @@ resources:
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_create_deploy
@@ -129,6 +134,7 @@ resources:
get_resource: mongo_dbms_start_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_configure_deploy
@@ -146,6 +152,7 @@ resources:
get_resource: mongo_db_create_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_start_deploy
@@ -164,6 +171,7 @@ resources:
get_resource: app_collectd_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_start_deploy
@@ -186,6 +194,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_collectd_create_deploy
@@ -203,6 +212,7 @@ resources:
get_resource: app_collectd_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_collectd_configure_deploy
@@ -220,6 +230,7 @@ resources:
get_resource: app_collectd_logstash_connect_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -238,6 +249,7 @@ resources:
get_resource: app_rsyslog_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_start_deploy
@@ -255,6 +267,7 @@ resources:
get_resource: app_rsyslog_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_rsyslog_configure_deploy
@@ -277,6 +290,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_rsyslog_create_deploy
@@ -294,6 +308,7 @@ resources:
get_resource: app_rsyslog_logstash_connect_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -312,6 +327,7 @@ resources:
get_resource: logstash_create_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- elasticsearch_start_deploy
@@ -329,6 +345,7 @@ resources:
get_resource: logstash_start_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -351,6 +368,7 @@ resources:
- networks
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -369,6 +387,7 @@ resources:
get_resource: elasticsearch_create_config
server:
get_resource: elasticsearch_server
+ signal_transport: HEAT_SIGNAL
elasticsearch_create_config:
type: OS::Heat::SoftwareConfig
@@ -384,6 +403,7 @@ resources:
get_resource: elasticsearch_start_config
server:
get_resource: elasticsearch_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- elasticsearch_create_deploy
@@ -402,6 +422,7 @@ resources:
get_resource: kibana_create_config
server:
get_resource: kibana_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- elasticsearch_start_deploy
@@ -429,6 +450,7 @@ resources:
server:
get_resource: kibana_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- kibana_create_deploy
@@ -446,6 +468,7 @@ resources:
get_resource: kibana_start_config
server:
get_resource: kibana_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- kibana_configure_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml
index 57623ae..e90289d 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_exchange_public_ssh_key.yaml
@@ -12,6 +12,7 @@ resources:
get_resource: generate_ssh_key_create_config
server:
get_resource: server1
+ signal_transport: HEAT_SIGNAL
import_public_key_create_deploy:
type: OS::Heat::SoftwareDeployment
properties:
@@ -24,6 +25,7 @@ resources:
- public_key
server:
get_resource: server2
+ signal_transport: HEAT_SIGNAL
depends_on:
- generate_ssh_key_create_deploy
server1:
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml
index e2a868d..fcba383 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_get_functions_semantic.yaml
@@ -16,6 +16,7 @@ resources:
get_resource: myapp_configure_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_database
server:
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml
index 05fa5e6..b3c9a64 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_host_assignment.yaml
@@ -41,6 +41,7 @@ resources:
get_resource: app_collectd_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_start_deploy
@@ -63,6 +64,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_collectd_create_deploy
@@ -80,6 +82,7 @@ resources:
get_resource: app_collectd_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- app_collectd_configure_deploy
@@ -97,6 +100,7 @@ resources:
get_resource: logstash_create_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
logstash_start_config:
type: OS::Heat::SoftwareConfig
@@ -112,6 +116,7 @@ resources:
get_resource: logstash_start_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
@@ -129,6 +134,7 @@ resources:
get_resource: app_collectd_logstash_connect_config
server:
get_resource: logstash_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- logstash_create_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml
index 692e701..f085b9d 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_interface_on_compute.yaml
@@ -12,6 +12,7 @@ resources:
get_resource: softwarecomponent_depending_on_customcompute_install_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- server_create_deploy
server:
@@ -42,4 +43,5 @@ resources:
install_path: /opt
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
outputs: {} \ No newline at end of file
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml
index 0d64128..b8de0e0 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_nodejs_mongodb_two_instances.yaml
@@ -28,6 +28,7 @@ resources:
get_resource: mongo_dbms_create_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
mongo_dbms_create_config:
type: OS::Heat::SoftwareConfig
@@ -48,6 +49,7 @@ resources:
- networks
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_create_deploy
@@ -65,6 +67,7 @@ resources:
get_resource: mongo_dbms_start_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_configure_deploy
@@ -82,6 +85,7 @@ resources:
get_resource: mongo_db_create_config
server:
get_resource: mongo_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_dbms_start_deploy
@@ -99,6 +103,7 @@ resources:
get_resource: nodejs_create_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
nodejs_create_config:
type: OS::Heat::SoftwareConfig
@@ -120,6 +125,7 @@ resources:
- networks
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mongo_db_create_deploy
- nodejs_create_deploy
@@ -138,6 +144,7 @@ resources:
get_resource: paypal_pizzastore_start_config
server:
get_resource: app_server
+ signal_transport: HEAT_SIGNAL
depends_on:
- paypal_pizzastore_configure_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml
index c35b54d..f0f7021 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_script_types.yaml
@@ -13,6 +13,7 @@ resources:
get_resource: customwebserver2_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
customwebserver_create_deploy:
type: OS::Heat::SoftwareDeployment
properties:
@@ -20,6 +21,7 @@ resources:
get_resource: customwebserver_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
server:
type: OS::Nova::Server
properties:
@@ -40,6 +42,7 @@ resources:
get_resource: customwebserver2_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- customwebserver2_configure_deploy
customwebserver2_create_config:
@@ -61,6 +64,7 @@ resources:
get_resource: customwebserver2_configure_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- customwebserver2_create_deploy
customwebserver_start_config:
@@ -76,6 +80,7 @@ resources:
get_resource: customwebserver_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- customwebserver_configure_deploy
customwebserver_create_config:
@@ -97,6 +102,7 @@ resources:
get_resource: customwebserver_configure_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- customwebserver_create_deploy
outputs: {}
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml
index 412108f..c43c125 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress.yaml
@@ -54,6 +54,7 @@ resources:
get_param: db_root_pwd
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
mysql_dbms_start_config:
type: OS::Heat::SoftwareConfig
@@ -69,6 +70,7 @@ resources:
get_resource: mysql_dbms_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_dbms_configure_deploy
@@ -88,6 +90,7 @@ resources:
db_port: 3366
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_dbms_create_deploy
@@ -114,6 +117,7 @@ resources:
get_param: db_user
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_dbms_start_deploy
@@ -131,6 +135,7 @@ resources:
get_resource: webserver_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
webserver_start_config:
type: OS::Heat::SoftwareConfig
@@ -146,6 +151,7 @@ resources:
get_resource: webserver_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- webserver_create_deploy
@@ -163,6 +169,7 @@ resources:
get_resource: wordpress_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- webserver_start_deploy
- mysql_database_configure_deploy
@@ -188,6 +195,7 @@ resources:
get_param: db_user
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- wordpress_create_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml
index 51ea198..0f954cf 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_single_instance_wordpress_from_csar.yaml
@@ -51,6 +51,7 @@ resources:
get_resource: mysql_dbms_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
mysql_dbms_start_config:
type: OS::Heat::SoftwareConfig
@@ -66,6 +67,7 @@ resources:
get_resource: mysql_dbms_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_dbms_configure_deploy
@@ -86,6 +88,7 @@ resources:
get_param: db_root_pwd
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_dbms_create_deploy
@@ -112,6 +115,7 @@ resources:
get_param: db_user
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- mysql_dbms_start_deploy
@@ -129,6 +133,7 @@ resources:
get_resource: webserver_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
webserver_start_config:
type: OS::Heat::SoftwareConfig
@@ -144,6 +149,7 @@ resources:
get_resource: webserver_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- webserver_create_deploy
@@ -161,6 +167,7 @@ resources:
get_resource: wordpress_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- webserver_start_deploy
- mysql_database_configure_deploy
@@ -186,6 +193,7 @@ resources:
get_param: db_user
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- wordpress_create_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml
index f632456..41663c6 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_software_component.yaml
@@ -31,6 +31,7 @@ resources:
get_resource: my_software_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
my_software_create_config:
type: OS::Heat::SoftwareConfig
@@ -46,6 +47,7 @@ resources:
get_resource: my_software_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- my_software_create_deploy
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 92f761b..c669f19 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
@@ -56,6 +56,7 @@ resources:
get_resource: MM_Active_create_config
server:
get_resource: MM_Active_Host
+ signal_transport: HEAT_SIGNAL
MM_Active_configure_config:
type: OS::Heat::SoftwareConfig
@@ -71,6 +72,7 @@ resources:
get_resource: MM_Active_configure_config
server:
get_resource: MM_Active_Host
+ signal_transport: HEAT_SIGNAL
depends_on:
- MM_Active_create_deploy
@@ -103,6 +105,7 @@ resources:
get_resource: MM_Passive_create_config
server:
get_resource: MM_Passive_Host
+ signal_transport: HEAT_SIGNAL
MM_Passive_configure_config:
type: OS::Heat::SoftwareConfig
@@ -118,6 +121,7 @@ resources:
get_resource: MM_Passive_configure_config
server:
get_resource: MM_Passive_Host
+ signal_transport: HEAT_SIGNAL
depends_on:
- MM_Passive_create_deploy
@@ -152,6 +156,7 @@ resources:
get_resource: CM_Active_create_config
server:
get_resource: CM_Active_Host
+ signal_transport: HEAT_SIGNAL
CM_Active_configure_config:
type: OS::Heat::SoftwareConfig
@@ -167,6 +172,7 @@ resources:
get_resource: CM_Active_configure_config
server:
get_resource: CM_Active_Host
+ signal_transport: HEAT_SIGNAL
depends_on:
- CM_Active_create_deploy
@@ -197,6 +203,7 @@ resources:
get_resource: CM_Passive_create_config
server:
get_resource: CM_Passive_Host
+ signal_transport: HEAT_SIGNAL
CM_Passive_configure_config:
type: OS::Heat::SoftwareConfig
@@ -212,6 +219,7 @@ resources:
get_resource: CM_Passive_configure_config
server:
get_resource: CM_Passive_Host
+ signal_transport: HEAT_SIGNAL
depends_on:
- CM_Passive_create_deploy
@@ -240,6 +248,7 @@ resources:
get_resource: DM_create_config
server:
get_resource: DM_Host
+ signal_transport: HEAT_SIGNAL
DM_configure_config:
type: OS::Heat::SoftwareConfig
@@ -255,6 +264,7 @@ resources:
get_resource: DM_configure_config
server:
get_resource: DM_Host
+ signal_transport: HEAT_SIGNAL
depends_on:
- DM_create_deploy
@@ -284,6 +294,7 @@ resources:
get_resource: LB_create_config
server:
get_resource: LB_Host
+ signal_transport: HEAT_SIGNAL
LB_configure_config:
type: OS::Heat::SoftwareConfig
@@ -299,6 +310,7 @@ resources:
get_resource: LB_configure_config
server:
get_resource: LB_Host
+ signal_transport: HEAT_SIGNAL
depends_on:
- LB_create_deploy
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml
index 7f045b5..278031b 100644
--- a/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml
+++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/hot_web_application.yaml
@@ -36,6 +36,7 @@ resources:
get_resource: web_server_create_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
web_server_create_config:
type: OS::Heat::SoftwareConfig
@@ -51,6 +52,7 @@ resources:
get_resource: web_server_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- web_server_create_deploy
@@ -71,6 +73,7 @@ resources:
get_param: context_root
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- web_server_start_deploy
@@ -88,6 +91,7 @@ resources:
get_resource: web_app_start_config
server:
get_resource: server
+ signal_transport: HEAT_SIGNAL
depends_on:
- web_app_create_deploy