openstack
/
magnum
Code Issues Proposed changes

Add "WAIT_CURL" parameter to the template of swarm 

Currently the 'WAIT_CURL' parameter is not exist in the heat-params
of swarm templates, but the configure-docker-storage.sh uses it.

Change-Id: I3bea848e206c67dcb791446f88f3fe6924d21a90
Closed-Bug: #1600074
This commit is contained in:
PanFengyun 2016-07-11 10:25:14 +08:00
parent 3d8c397c07
commit dca691d629
4 changed files with 4 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/write-heat-params-master.yaml
View File

@ -7,6 +7,7 @@ write_files:
content: |
WAIT_HANDLE_ENDPOINT="$WAIT_HANDLE_ENDPOINT"
WAIT_HANDLE_TOKEN="$WAIT_HANDLE_TOKEN"
WAIT_CURL="$WAIT_CURL"
ETCD_DISCOVERY_URL="$ETCD_DISCOVERY_URL"
DOCKER_VOLUME="$DOCKER_VOLUME"
DOCKER_STORAGE_DRIVER="$DOCKER_STORAGE_DRIVER"

1
magnum/drivers/swarm_fedora_atomic_v1/templates/fragments/write-heat-params-node.yaml
View File

@ -7,6 +7,7 @@ write_files:
content: |
WAIT_HANDLE_ENDPOINT="$WAIT_HANDLE_ENDPOINT"
WAIT_HANDLE_TOKEN="$WAIT_HANDLE_TOKEN"
WAIT_CURL="$WAIT_CURL"
DOCKER_VOLUME="$DOCKER_VOLUME"
DOCKER_STORAGE_DRIVER="$DOCKER_STORAGE_DRIVER"
HTTP_PROXY="$HTTP_PROXY"

1
magnum/drivers/swarm_fedora_atomic_v1/templates/swarmmaster.yaml
View File

@ -177,6 +177,7 @@ resources:
params:
"$WAIT_HANDLE_ENDPOINT": {get_attr: [cloud_init_wait_handle, endpoint]}
"$WAIT_HANDLE_TOKEN": {get_attr: [cloud_init_wait_handle, token]}
"$WAIT_CURL": {get_attr: [master_wait_handle, curl_cli]}
"$DOCKER_VOLUME": {get_resource: docker_volume}
"$DOCKER_STORAGE_DRIVER": {get_param: docker_storage_driver}
"$ETCD_DISCOVERY_URL": {get_param: discovery_url}

1
magnum/drivers/swarm_fedora_atomic_v1/templates/swarmnode.yaml
View File

@ -201,6 +201,7 @@ resources:
"$SWARM_VERSION": {get_param: swarm_version}
"$AGENT_WAIT_HANDLE_ENDPOINT": {get_attr: [node_agent_wait_handle, endpoint]}
"$AGENT_WAIT_HANDLE_TOKEN": {get_attr: [node_agent_wait_handle, token]}
"$WAIT_CURL": {get_attr: [node_agent_wait_handle, curl_cli]}
"$TRUSTEE_DOMAIN_ID": {get_param: trustee_domain_id}
"$TRUSTEE_USER_ID": {get_param: trustee_user_id}
"$TRUSTEE_USERNAME": {get_param: trustee_username}