openstack
/
magnum
Code Issues Proposed changes

Correct the wrong parameter pass 

The swarm heat use wrong parameter pass, which cause the swarm bay creation
reference wrong issue.

Closes-Bug: #1458445
Change-Id: I5ff824cc615fd392372f5578c62fb7f76454b599
This commit is contained in:
Kai Qiang Wu(Kennan) 2015-05-25 15:50:47 +08:00
parent a34316f7b3
commit d9db22b696
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
magnum/templates/docker-swarm/swarmnode.yaml
View File

@ -58,10 +58,10 @@ resources:
node_agent_wait_condition: node_agent_wait_condition:
type: "AWS::CloudFormation::WaitCondition" type: "AWS::CloudFormation::WaitCondition"
depends_on: depends_on:
- swarm_manager - swarm_node
properties: properties:
Handle: Handle:
get_resource: agent_wait_handle get_resource: node_agent_wait_handle
Timeout: 6000 Timeout: 6000
###################################################################### ######################################################################
@ -131,7 +131,7 @@ resources:
params: params:
"$NODE_IP": {get_attr: [swarm_node_eth0, fixed_ips, 0, ip_address]} "$NODE_IP": {get_attr: [swarm_node_eth0, fixed_ips, 0, ip_address]}
"$DISCOVERY_URL": {get_param: discovery_url} "$DISCOVERY_URL": {get_param: discovery_url}
"$WAIT_HANDLE": {get_resource: node_agent_wait_condition} "$WAIT_HANDLE": {get_resource: node_agent_wait_handle}
enable_services: enable_services:
type: "OS::Heat::SoftwareConfig" type: "OS::Heat::SoftwareConfig"