openstack
/
heat-templates
Code Issues Proposed changes

Merge "Remove underscore in autoscaling group name"

This commit is contained in:
Jenkins 2014-12-25 21:45:04 +00:00 committed by Gerrit Code Review
parent fa17321613 87d60e02ed
commit f35e89b5c3
5 changed files with 27 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hot/asg_of_servers.yaml
View File

@ -44,7 +44,7 @@ parameters:
default: private
resources:
my_asg:
asg:
type: OS::Heat::AutoScalingGroup
properties:
resource:
@ -62,7 +62,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: my_asg}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: 1
@ -70,7 +70,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: my_asg}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: '-1'

6
hot/autoscaling.yaml
View File

@ -59,7 +59,7 @@ resources:
$db_name: {get_param: database_name}
$db_user: {get_param: database_user}
$db_password: {get_attr: [database_password, value]}
web_server_group:
asg:
type: OS::Heat::AutoScalingGroup
properties:
min_size: 1
@ -98,14 +98,14 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: web_server_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: 1
web_server_scaledown_policy:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: web_server_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: -1
cpu_alarm_high:

16
openshift-origin/F19/hot-template/openshift-scalable-cpu-nbgears/openshift.yaml
View File

@ -94,7 +94,7 @@ parameters:
description: Password of your Openstack account
type: string
default: network
node_instance_group_template_repo_address:
asg_template_repo_address:
description: Repository address of the NodeInstanceGroup Template
type: string
public_ssh_key:
@ -423,7 +423,7 @@ resources:
user_data: {get_resource: broker_user_data}
user_data_format: RAW
node_instance_group:
asg:
type: OS::Heat::AutoScalingGroup
depends_on:
- router_gateway
@ -432,9 +432,9 @@ resources:
min_size: 1
max_size: 4
resource:
type: {get_param: node_instance_group_template_repo_address}
type: {get_param: asg_template_repo_address}
properties:
metadata: {"metering.group": "node_instance_group"}
metadata: {"metering.group": "asg"}
private_network: {get_resource: private_network}
private_sub_network: {get_resource: private_sub_network}
ssh_key: {get_resource: ssh_key}
@ -446,7 +446,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: node_instance_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: 1
@ -454,7 +454,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: node_instance_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: -1
@ -470,7 +470,7 @@ resources:
alarm_actions:
- {get_attr: [scale_up_policy, alarm_url]}
comparison_operator: gt
matching_metadata: {'metadata.user_metadata.group': 'node_instance_group'}
matching_metadata: {'metadata.user_metadata.group': 'asg'}
cpu_alarm_low:
type: OS::Ceilometer::Alarm
@ -484,7 +484,7 @@ resources:
alarm_actions:
- {get_attr: [scale_down_policy, alarm_url]}
comparison_operator: lt
matching_metadata: {'metadata.user_metadata.group': 'node_instance_group'}
matching_metadata: {'metadata.user_metadata.group': 'asg'}
gears_alarm_high:
type: OS::Ceilometer::Alarm

16
openshift-origin/F19/hot-template/openshift-scalable-cpu/openshift.yaml
View File

@ -94,7 +94,7 @@ parameters:
description: Password of your Openstack account
type: string
default: network
node_instance_group_template_repo_address:
asg_template_repo_address:
description: Repository address of the NodeInstanceGroup Template
type: string
public_ssh_key:
@ -403,7 +403,7 @@ resources:
user_data: {get_resource: broker_user_data}
user_data_format: RAW
node_instance_group:
asg:
type: OS::Heat::AutoScalingGroup
depends_on:
- router_gateway
@ -412,9 +412,9 @@ resources:
min_size: 1
max_size: 4
resource:
type: {get_param: node_instance_group_template_repo_address}
type: {get_param: asg_template_repo_address}
properties:
metadata: {"metering.group": "node_instance_group"}
metadata: {"metering.group": "asg"}
private_network: {get_resource: private_network}
private_sub_network: {get_resource: private_sub_network}
ssh_key: {get_resource: ssh_key}
@ -426,7 +426,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: node_instance_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: 1
@ -434,7 +434,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: node_instance_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: -1
@ -450,7 +450,7 @@ resources:
alarm_actions:
- {get_attr: [scale_up_policy, alarm_url]}
comparison_operator: gt
matching_metadata: {'metadata.user_metadata.group': 'node_instance_group'}
matching_metadata: {'metadata.user_metadata.group': 'asg'}
cpu_alarm_low:
type: OS::Ceilometer::Alarm
@ -464,4 +464,4 @@ resources:
alarm_actions:
- {get_attr: [scale_down_policy, alarm_url]}
comparison_operator: lt
matching_metadata: {'metadata.user_metadata.group': 'node_instance_group'}
matching_metadata: {'metadata.user_metadata.group': 'asg'}

10
openshift-origin/F19/hot-template/openshift-scalable-nbgears/openshift.yaml
View File

@ -94,7 +94,7 @@ parameters:
description: Password of your Openstack account
type: string
default: network
node_instance_group_template_repo_address:
asg_template_repo_address:
description: Repository address of the NodeInstanceGroup Template
type: string
public_ssh_key:
@ -423,7 +423,7 @@ resources:
user_data: {get_resource: broker_user_data}
user_data_format: RAW
node_instance_group:
asg:
type: OS::Heat::AutoScalingGroup
depends_on:
- router_gateway
@ -432,7 +432,7 @@ resources:
min_size: 1
max_size: 4
resource:
type: {get_param: node_instance_group_template_repo_address}
type: {get_param: asg_template_repo_address}
properties:
private_network: {get_resource: private_network}
private_sub_network: {get_resource: private_sub_network}
@ -445,7 +445,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: node_instance_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: 1
@ -453,7 +453,7 @@ resources:
type: OS::Heat::ScalingPolicy
properties:
adjustment_type: change_in_capacity
auto_scaling_group_id: {get_resource: node_instance_group}
auto_scaling_group_id: {get_resource: asg}
cooldown: 60
scaling_adjustment: -1