openstack/magnum
Code Issues Proposed changes

Merge "Swarm agent to get templated proxy values"

Browse Source
This commit is contained in:
Jenkins 2015-09-09 22:57:59 +00:00 committed by Gerrit Code Review
commit 8bb2f5f2c9
1 changed files with 3 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -156,6 +156,9 @@ resources:
"$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_handle} "$WAIT_HANDLE": {get_resource: node_agent_wait_handle}
"$HTTP_PROXY": {get_param: http_proxy}
"$HTTPS_PROXY": {get_param: https_proxy}
"$NO_PROXY": {get_param: no_proxy}
enable_services: enable_services:
type: "OS::Heat::SoftwareConfig" type: "OS::Heat::SoftwareConfig"