Skip to content

Make consulTTL value configurable #204

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Make consulTTL value configurable #204

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions jobs/auctioneer/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,3 +48,7 @@ properties:
description: "capacity of the tls client cache"
diego.auctioneer.bbs.max_idle_conns_per_host:
description: "maximum number of idle http connections"

consul.ttl_in_seconds:
description: "TTL value for consul registration in seconds"
default: 3
1 change: 1 addition & 0 deletions jobs/auctioneer/templates/auctioneer_as_vcap.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ export GODEBUG=netdns=cgo
-bbsMaxIdleConnsPerHost=<%= value %> \
<% end %> \
-consulCluster=http://127.0.0.1:8500 \
-consulTTL=<%= p("consul.ttl_in_seconds") %> \
-debugAddr=<%= p("diego.auctioneer.debug_addr") %> \
-listenAddr=<%= p("diego.auctioneer.listen_addr") %> \
-dropsondePort=<%= p("diego.auctioneer.dropsonde_port") %> \
Expand Down
4 changes: 4 additions & 0 deletions jobs/bbs/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,3 +101,7 @@ properties:
diego.bbs.convergence.expire_pending_task_duration_in_seconds:
description: "unclaimed tasks are marked as failed, after this duration in seconds"
default: 1800

consul.ttl_in_seconds:
description: "TTL value for consul registration in seconds"
default: 3
1 change: 1 addition & 0 deletions jobs/bbs/templates/bbs_as_vcap.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,6 +60,7 @@ etcd_flags=""
-advertiseURL=${ad_url_scheme}<%="://#{name.gsub('_', '-')}-#{spec.index}.#{p("diego.bbs.advertisement_base_hostname")}:#{p("diego.bbs.listen_addr").split(':')[1]}" %> \
-auctioneerAddress=<%= p("diego.bbs.auctioneer.api_url") %> \
-consulCluster=http://127.0.0.1:8500 \
-consulTTL=<%= p("consul.ttl_in_seconds") %> \
-debugAddr=<%= p("diego.bbs.debug_addr") %> \
<% p("diego.bbs.encryption_keys").each do |encryption_key| %> \
-encryptionKey=<%= Shellwords.shellescape("#{encryption_key["label"]}:#{encryption_key["passphrase"]}") %> \
Expand Down
4 changes: 4 additions & 0 deletions jobs/file_server/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,7 @@ properties:
diego.file_server.dropsonde_port:
description: "local metron agent's port"
default: 3457

consul.ttl_in_seconds:
description: "TTL value for consul registration in seconds"
default: 3
1 change: 1 addition & 0 deletions jobs/file_server/templates/file_server_as_vcap.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ export GODEBUG=netdns=cgo
/var/vcap/packages/file_server/bin/file-server \
-address=<%= p("diego.file_server.listen_addr") %> \
-consulCluster=http://127.0.0.1:8500 \
-consulTTL=<%= p("consul.ttl_in_seconds") %> \
-debugAddr=<%= p("diego.file_server.debug_addr") %> \
-staticDirectory=<%= p("diego.file_server.static_directory") %> \
-dropsondePort=<%= p("diego.file_server.dropsonde_port") %> \
Expand Down
4 changes: 3 additions & 1 deletion jobs/ssh_proxy/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,4 +73,6 @@ properties:
diego.ssh_proxy.bbs.max_idle_conns_per_host:
description: "maximum number of idle http connections"


consul.ttl_in_seconds:
description: "TTL value for consul registration in seconds"
default: 3
1 change: 1 addition & 0 deletions jobs/ssh_proxy/templates/ssh_proxy_as_vcap.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,6 +50,7 @@ export GODEBUG=netdns=cgo
${uaa_flags} \
-address=<%= p("diego.ssh_proxy.listen_addr") %> \
-consulCluster=http://127.0.0.1:8500 \
-consulTTL=<%= p("consul.ttl_in_seconds") %> \
-hostKey="$HOST_KEY" \
<% if_p("diego.ssh_proxy.allowed_ciphers") do |value| %> \
-allowedCiphers=<%= value %> \
Expand Down