← Back to branch summary

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

« back to all changes in this revision

Viewing changes to src/github.com/juju/juju/cmd/jujud/agent/machine.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:
src/github.com/juju/juju/cmd/jujud/agent/machine.go
1055
1055
        if !ok {
1056
1056
                return nil, &cmdutil.FatalError{"StateServingInfo not available and we need it"}
1057
1057
        }
1058
 
        cert := []byte(info.Cert)
1059
 
        key := []byte(info.PrivateKey)
 
1058
        cert := info.Cert
 
1059
        key := info.PrivateKey
1060
1060
 
1061
1061
        if len(cert) == 0 || len(key) == 0 {
1062
1062
                return nil, &cmdutil.FatalError{"configuration does not have controller cert/key"}
1084
1084
        }
1085
1085
 
1086
1086
        server, err := apiserver.NewServer(st, listener, apiserver.ServerConfig{
 
1087
                Clock:       clock.WallClock,
1087
1088
                Cert:        cert,
1088
1089
                Key:         key,
1089
1090
                Tag:         tag,