Skip to content

Commit

Permalink
Update deck to resolve bake details url (aka the logs) via gate inste…
Browse files Browse the repository at this point in the history
…ad of directly via rosco. (#1232)

Drop :8087 from various port forwarding examples/commands.
The proxy-config for rosco in the apache config was not touched.
  • Loading branch information
Matt Duftler committed Oct 13, 2016
1 parent 269a973 commit 151d29a
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 6 deletions.
3 changes: 1 addition & 2 deletions config/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@
// BEGIN reconfigure_spinnaker

// var gateUrl = ${services.deck.gateUrl};
// var bakeryBaseUrl = ${services.deck.bakeryUrl};
// var authEnabled = ${services.deck.auth.enabled};
// var defaultTimeZone = ${services.deck.timezone};
// var awsDefaultRegion = ${providers.aws.defaultRegion};
Expand Down Expand Up @@ -43,7 +42,7 @@

window.spinnakerSettings = {
gateUrl: gateUrl,
bakeryDetailUrl: bakeryBaseUrl + '/api/v1/global/logs/{{context.status.id}}?html=true',
bakeryDetailUrl: gateUrl + '/bakery/logs/global/{{context.status.id}}',
authEndpoint: gateUrl + '/auth/user',
pollSchedule: 30000,
defaultTimeZone: defaultTimeZone, // see http://momentjs.com/timezone/docs/#/data-utilities/
Expand Down
3 changes: 1 addition & 2 deletions dev/create_google_dev_vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -35,8 +35,7 @@
gcloud compute ssh --project {project} --zone {zone} {instance}\
--ssh-flag="-L 9000:localhost:9000"\
--ssh-flag="-L 8084:localhost:8084"\
--ssh-flag="-L 8087:localhost:8087"
--ssh-flag="-L 8084:localhost:8084"
(2) Wait for the installation to complete:
Expand Down
2 changes: 1 addition & 1 deletion experimental/kubernetes/ha/deck/config/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

var feedbackUrl = 'http://localhost';
var gateHost = 'http://localhost:8084';
var bakeryDetailUrl = 'http://localhost:8087';
var bakeryDetailUrl = gateHost + '/bakery/logs/global/{{context.status.id}}';

window.spinnakerSettings = {
defaultProviders: ['aws', 'gce', 'azure', 'cf', 'kubernetes', 'titan'],
Expand Down
1 change: 0 additions & 1 deletion packer/init.aws.region
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,6 @@ echo ' HostName' $public_hostname
echo ' IdentityFile /path/to/private/key'
echo ' LocalForward 9000 127.0.0.1:9000'
echo ' LocalForward 8084 127.0.0.1:8084'
echo ' LocalForward 8087 127.0.0.1:8087'
echo ' User ubuntu'
echo
echo 'If the ssh config file is new. Ensure it is chmod 400'
Expand Down

0 comments on commit 151d29a

Please sign in to comment.