Delete unused discovery_url for swarm
The swarmnode of Swarm bay don't need discovery_url, so let's delete it from heat templates. Change-Id: I48f775e795e1985ada9da7d7660f159df13da7ac
This commit is contained in:
parent
cb99c64614
commit
3ac87044dc
|
@ -382,7 +382,6 @@ resources:
|
||||||
fixed_network_id: {get_resource: fixed_network}
|
fixed_network_id: {get_resource: fixed_network}
|
||||||
fixed_subnet_id: {get_resource: fixed_subnet}
|
fixed_subnet_id: {get_resource: fixed_subnet}
|
||||||
external_network: {get_param: external_network}
|
external_network: {get_param: external_network}
|
||||||
discovery_url: {get_param: discovery_url}
|
|
||||||
http_proxy: {get_param: http_proxy}
|
http_proxy: {get_param: http_proxy}
|
||||||
https_proxy: {get_param: https_proxy}
|
https_proxy: {get_param: https_proxy}
|
||||||
no_proxy: {get_param: no_proxy}
|
no_proxy: {get_param: no_proxy}
|
||||||
|
|
|
@ -280,7 +280,6 @@ resources:
|
||||||
params:
|
params:
|
||||||
"$ETCD_SERVER_IP": {get_param: etcd_server_ip}
|
"$ETCD_SERVER_IP": {get_param: etcd_server_ip}
|
||||||
"$NODE_IP": {get_attr: [swarm_master_eth0, fixed_ips, 0, ip_address]}
|
"$NODE_IP": {get_attr: [swarm_master_eth0, fixed_ips, 0, ip_address]}
|
||||||
"$DISCOVERY_URL": {get_param: discovery_url}
|
|
||||||
"$WAIT_HANDLE_ENDPOINT": {get_attr: [master_wait_handle, endpoint]}
|
"$WAIT_HANDLE_ENDPOINT": {get_attr: [master_wait_handle, endpoint]}
|
||||||
"$WAIT_HANDLE_TOKEN": {get_attr: [master_wait_handle, token]}
|
"$WAIT_HANDLE_TOKEN": {get_attr: [master_wait_handle, token]}
|
||||||
"$HTTP_PROXY": {get_param: http_proxy}
|
"$HTTP_PROXY": {get_param: http_proxy}
|
||||||
|
|
|
@ -51,10 +51,6 @@ parameters:
|
||||||
type: string
|
type: string
|
||||||
description: network range for flannel overlay network
|
description: network range for flannel overlay network
|
||||||
|
|
||||||
discovery_url:
|
|
||||||
type: string
|
|
||||||
description: url provided for node discovery
|
|
||||||
|
|
||||||
http_proxy:
|
http_proxy:
|
||||||
type: string
|
type: string
|
||||||
description: http proxy address for docker
|
description: http proxy address for docker
|
||||||
|
|
Loading…
Reference in New Issue