diff options
| author |   shangxdy <shang.xiaodong@zte.com.cn> | 2017-07-17 17:40:59 +0800 |
|---|---|---|
| committer | shangxdy <shang.xiaodong@zte.com.cn> | 2017-07-17 17:40:59 +0800 |
| commit | c7491340551cdd9d757d63b4bbe79132506e386a (patch) | |
| tree | ae14fd406f3f0ebe415ce69bd9c6d0698af30d1e /tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling | |
| parent | 859e2826074aa51e0334d4607ccfcde5972e882e (diff) | |
Synchronize upstream version of 0.9
Synchronize heat-translator wiht upstream versionn of 0.9
JIRA: PARSER-128
Change-Id: I4d2c62a0e81119d5c0305e3ac052415a6d5acee3
Signed-off-by: shangxdy <shang.xiaodong@zte.com.cn>
Diffstat (limited to 'tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling')
2 files changed, 4 insertions, 0 deletions
diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_autoscaling.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_autoscaling.yaml index 1cd2c03..a83f019 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_autoscaling.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_autoscaling.yaml @@ -10,6 +10,7 @@ resources: properties: min_size: 2 desired_capacity: 3 + cooldown: 60 resource: type: asg_res.yaml max_size: 10 @@ -20,6 +21,7 @@ resources: get_resource: asg_group adjustment_type: change_in_capacity scaling_adjustment: 1 + cooldown: 60 asg_scale_in: type: OS::Heat::ScalingPolicy properties: @@ -27,6 +29,7 @@ resources: get_resource: asg_group adjustment_type: change_in_capacity scaling_adjustment: -1 + cooldown: 60 asg_alarm: type: OS::Aodh::Alarm properties: diff --git a/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_cluster_autoscaling.yaml b/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_cluster_autoscaling.yaml index ca0fb3a..e0dbb7f 100644 --- a/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_cluster_autoscaling.yaml +++ b/tosca2heat/heat-translator/translator/tests/data/hot_output/autoscaling/hot_cluster_autoscaling.yaml @@ -12,6 +12,7 @@ resources: properties:
flavor: m1.medium
image: rhel-6.5-test-image
+ software_config_transport: POLL_SERVER_HEAT
networks:
- network: net0
cluster_scaling_scale_out:
|