Merge "Add "WAIT_CURL" parameter to the template of swarm"
This commit is contained in:
commit
b314e40dc6
|
@ -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"
|
||||
|
|
|
@ -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"
|
||||
|
|
|
@ -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}
|
||||
|
|
|
@ -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}
|
||||
|
|
Loading…
Reference in New Issue