openstack/heat-templates
Code Issues Proposed changes

Merge "Add network parameter to templates"

Browse Source
This commit is contained in:
Jenkins 2015-03-10 00:34:29 +00:00 committed by Gerrit Code Review
commit c44365e618
2 changed files with 10 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hot/autoscaling.yaml
View File

@ -13,6 +13,9 @@ parameters:
database_flavor:
type: string
description: flavor used by the db server
network:
type: string
description: Network used by the server
subnet_id:
type: string
description: subnet on which the load balancer will be located
@ -38,6 +41,7 @@ resources:
flavor: {get_param: database_flavor}
image: {get_param: image}
key_name: {get_param: key}
networks: [{network: {get_param: network} }]
user_data_format: RAW
user_data:
str_replace:
@ -70,6 +74,7 @@ resources:
flavor: {get_param: flavor}
image: {get_param: image}
key_name: {get_param: key}
network: {get_param: network}
pool_id: {get_resource: pool}
metadata: {"metering.stack": {get_param: "OS::stack_id"}}
user_data:

5
hot/lb_server.yaml
View File

@ -18,6 +18,10 @@ parameters:
description: Server user_data
metadata:
type: json
network:
type: string
description: Network used by the server
resources:
server:
type: OS::Nova::Server
@ -28,6 +32,7 @@ resources:
metadata: {get_param: metadata}
user_data: {get_param: user_data}
user_data_format: RAW
networks: [{network: {get_param: network} }]
member:
type: OS::Neutron::PoolMember
properties: