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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/provider/gce/environ_broker.go

  • Committer: Nicholas Skaggs
  • Date: 2016-09-30 14:39:30 UTC
  • mfrom: (1.8.1)
  • Revision ID: nicholas.skaggs@canonical.com-20160930143930-vwwhrefh6ftckccy
import upstream

Show diffs side-by-side

added added

removed removed

Lines of Context:
203
203
                // See: http://cloudinit.readthedocs.org
204
204
                metadata[metadataKeyEncoding] = "base64"
205
205
 
206
 
                authKeys, err := google.FormatAuthorizedKeys(args.InstanceConfig.AuthorizedKeys, "ubuntu")
207
 
                if err != nil {
208
 
                        return nil, errors.Trace(err)
209
 
                }
210
 
 
211
 
                metadata[metadataKeySSHKeys] = authKeys
212
206
        case jujuos.Windows:
213
207
                metadata[metadataKeyWindowsUserdata] = string(userData)
214
208