← Back to branch summary

~juju-qa/ubuntu/yakkety/juju/2.0-beta7

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/lxd/provider.go

  • Committer: Martin Packman
  • Date: 2016-04-26 01:22:28 UTC
  • mfrom: (1.4.1)
  • Revision ID: martin.packman@canonical.com-20160426012228-q9e97cerwfgk5xhk
Merge new upstream source 2.0~beta6 resolving conflicts due to beta5 import

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/github.com/juju/juju/provider/lxd/provider.go
7
7
 
8
8
import (
9
9
        "github.com/juju/errors"
 
10
        "gopkg.in/juju/environschema.v1"
10
11
 
11
12
        "github.com/juju/juju/cloud"
12
13
        "github.com/juju/juju/environs"
107
108
        // locally-configured remotes.
108
109
        return []cloud.Region{{Name: "localhost"}}, nil
109
110
}
 
111
 
 
112
// Schema returns the configuration schema for an environment.
 
113
func (environProvider) Schema() environschema.Fields {
 
114
        fields, err := config.Schema(configSchema)
 
115
        if err != nil {
 
116
                panic(err)
 
117
        }
 
118
        return fields
 
119
}