openstack
/
heat-templates
Code Issues Proposed changes

Merge "Fix alarm metadata in new autoscaling template"

This commit is contained in:
Jenkins 2014-04-08 09:14:19 +00:00 committed by Gerrit Code Review
parent d939d59610 bc081a1031
commit 1b48017020
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hot/autoscaling.yaml
View File

@ -68,6 +68,7 @@ resources:
image: {get_param: image}
key_name: {get_param: key}
pool_id: {get_resource: pool}
metadata: {"metering.stack": {get_param: "OS::stack_id"}}
user_data:
str_replace:
template: |
@ -115,7 +116,7 @@ resources:
threshold: 50
alarm_actions:
- {get_attr: [web_server_scaleup_policy, alarm_url]}
matching_metadata: {'metadata.user_metadata.groupname': {get_resource: web_server_group}}
matching_metadata: {'metadata.user_metadata.stack': {get_param: "OS::stack_id"}}
comparison_operator: gt
cpu_alarm_low:
type: OS::Ceilometer::Alarm
@ -128,7 +129,7 @@ resources:
threshold: 15
alarm_actions:
- {get_attr: [web_server_scaledown_policy, alarm_url]}
matching_metadata: {'metadata.user_metadata.groupname': {get_resource: web_server_group}}
matching_metadata: {'metadata.user_metadata.stack': {get_param: "OS::stack_id"}}
comparison_operator: lt
monitor:
type: OS::Neutron::HealthMonitor

3
hot/lb_server.yaml
View File

@ -16,6 +16,8 @@ parameters:
user_data:
type: string
description: Server user_data
metadata:
type: json
resources:
server:
type: OS::Nova::Server
@ -23,6 +25,7 @@ resources:
flavor: {get_param: flavor}
image: {get_param: image}
key_name: {get_param: key_name}
metadata: {get_param: metadata}
user_data: {get_param: user_data}
user_data_format: RAW
member: