Skip to content

Make the BBS advertise address configurable #153

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

Merged
merged 1 commit into from
Apr 7, 2016
Merged

Make the BBS advertise address configurable #153

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
3 changes: 3 additions & 0 deletions jobs/bbs/spec
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,9 @@ properties:
diego.bbs.dropsonde_port:
description: "local metron agent's port"
default: 3457
diego.bbs.advertisement_base_hostname:
description: "Suffix for the BBS advertised hostname"
default: "bbs.service.cf.internal"
diego.bbs.auctioneer.api_url:
description: "Address of the auctioneer API"
default: "http://auctioneer.service.cf.internal:9016"
Expand Down
2 changes: 1 addition & 1 deletion jobs/bbs/templates/bbs_ctl.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,7 +78,7 @@ case $1 in

exec chpst -u vcap:vcap /var/vcap/packages/bbs/bin/bbs ${etcd_sec_flags} ${bbs_sec_flags} \
-activeKeyLabel='<%= p("diego.bbs.active_key_label") %>' \
-advertiseURL=${ad_url_scheme}<%="://#{name.gsub('_', '-')}-#{spec.index}.bbs.service.cf.internal:#{p("diego.bbs.listen_addr").split(':')[1]}" %> \
-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 \
-debugAddr=<%= p("diego.bbs.debug_addr") %> \
Expand Down