openstack
/
magnum
Code Issues Proposed changes

Fix wrong parameter passed to heat-params 

1 swarm master won't know swarm node's ip, remove it.
2 SWARM_MASTER_IP passed to swarm node should be a private ip.
3 Remove FIXED_NETWORK_CIDR which is useless

Closes-Bug: #1492963
Change-Id: I3ec1923d94be346890bbd2117501f60645d33c0c
This commit is contained in:
Eli Qiao 2015-09-07 16:49:12 +08:00
parent 7ed30d1989
commit c985847fba
3 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
magnum/templates/docker-swarm/fragments/write-heat-params.yaml
View File

@ -9,6 +9,4 @@ write_files:
HTTP_PROXY="$HTTP_PROXY"
HTTPS_PROXY="$HTTPS_PROXY"
NO_PROXY="$NO_PROXY"
FIXED_NETWORK_CIDR="$FIXED_NETWORK_CIDR"
SWARM_MASTER_IP="$SWARM_MASTER_IP"
SWARM_NODE_IP="$NODE_IP"

4
magnum/templates/docker-swarm/swarm.yaml
View File

@ -170,7 +170,7 @@ resources:
"$HTTP_PROXY": {get_param: http_proxy}
"$HTTPS_PROXY": {get_param: https_proxy}
"$NO_PROXY": {get_param: no_proxy}
"$NODE_IP": {get_attr: [swarm_master_eth0, fixed_ips, 0, ip_address]}
"$SWARM_MASTER_IP": {get_attr: [swarm_master_eth0, fixed_ips, 0, ip_address]}
remove_docker_key:
type: "OS::Heat::SoftwareConfig"
@ -332,7 +332,7 @@ resources:
http_proxy: {get_param: http_proxy}
https_proxy: {get_param: https_proxy}
no_proxy: {get_param: no_proxy}
swarm_master_ip: {get_attr: [swarm_master_floating, floating_ip_address]}
swarm_master_ip: {get_attr: [swarm_master_eth0, fixed_ips, 0, ip_address]}
outputs:

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

@ -119,7 +119,6 @@ resources:
"$HTTPS_PROXY": {get_param: https_proxy}
"$NO_PROXY": {get_param: no_proxy}
"$SWARM_MASTER_IP": {get_param: swarm_master_ip}
"$NODE_IP": {get_attr: [swarm_node_eth0, fixed_ips, 0, ip_address]}
remove_docker_key:
type: "OS::Heat::SoftwareConfig"