~juju-qa/ubuntu/xenial/juju/xenial-2.0-beta3

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cloud/fallback-public-cloud.yaml

  • Committer: Martin Packman
  • Date: 2016-03-30 19:31:08 UTC
  • mfrom: (1.1.41)
  • Revision ID: martin.packman@canonical.com-20160330193108-h9iz3ak334uk0z5r
Merge new upstream source 2.0~beta3

Show diffs side-by-side

added added

removed removed

Lines of Context:
38
38
        endpoint: https://ec2.us-gov-west-1.amazonaws-govcloud.com
39
39
  google:
40
40
    type: gce
41
 
    auth-types: [ oauth2 ]
 
41
    auth-types: [ jsonfile, oauth2 ]
42
42
    regions:
43
43
      us-east1:
44
44
        endpoint: https://www.googleapis.com