Skip to content

Commit

Permalink
fix(provider/dcos): Fixup base and deck dcos config. (spinnaker#1932)
Browse files Browse the repository at this point in the history
  • Loading branch information
Matt Duftler authored Aug 28, 2017
1 parent 7929d47 commit 79e1b8c
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 1 deletion.
2 changes: 1 addition & 1 deletion config/settings.js
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@
// var openstackPrimaryAccount = ${providers.openstack.primaryCredentials.name};
// var openstackDefaultRegion = ${providers.openstack.defaultRegion};
// var appenginePrimaryAccount = ${providers.appengine.primaryCredentials.name};
// var dcosPrimaryAccount = ${providers.docs.primaryCredentials.name};
// var dcosPrimaryAccount = ${providers.dcos.primaryCredentials.name};

// END reconfigure_spinnaker
/**
Expand Down
6 changes: 6 additions & 0 deletions config/spinnaker.yml
Original file line number Diff line number Diff line change
Expand Up @@ -381,4 +381,10 @@ providers:
gitHttpsPassword: ${SPINNAKER_APPENGINE_GIT_HTTPS_PASSWORD:}
githubOAuthAccessToken: ${SPINNAKER_APPENGINE_GITHUB_OAUTH_ACCESS_TOKEN:}

dcos:
enabled: ${SPINNAKER_DCOS_ENABLED:false}

primaryCredentials:
name: my-dcos-account

management.security.enabled: false

0 comments on commit 79e1b8c

Please sign in to comment.