← Back to branch summary

~james-page/ubuntu/wily/juju-core/mir-fixes

« back to all changes in this revision

Viewing changes to src/launchpad.net/juju-core/state/api/params/params.go

  • Committer: Package Import Robot
  • Author(s): James Page
  • Date: 2014-03-28 08:58:42 UTC
  • mfrom: (1.1.21)
  • Revision ID: package-import@ubuntu.com-20140328085842-cyzrgc120bdfxwj0
Tags: 1.17.7-0ubuntu1
https://launchpad.net/bugs/1294776
https://launchpad.net/bugs/1297077
* New upstream point release, including fixes for:
  - no debug log with all providers on Ubuntu 14.04 (LP: #1294776).
* d/control: Add cpu-checker dependency to juju-local (LP: #1297077).

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/launchpad.net/juju-core/state/api/params/params.go
149
149
        ConfigYAML    string // Takes precedence over config if both are present.
150
150
        Constraints   constraints.Value
151
151
        ToMachineSpec string
 
152
        // The following fields are supported from 1.17.7 onwards and
 
153
        // ignored before that.
 
154
        IncludeNetworks []string
 
155
        ExcludeNetworks []string
152
156
}
153
157
 
154
158
// ServiceUpdate holds the parameters for making the ServiceUpdate call.
453
457
        Id   interface{}
454
458
}
455
459
 
 
460
// StateServingInfo holds information needed by a state
 
461
// server.
 
462
type StateServingInfo struct {
 
463
        APIPort    int
 
464
        StatePort  int
 
465
        Cert       string
 
466
        PrivateKey string
 
467
        // this will be passed as the KeyFile argument to MongoDB
 
468
        SharedSecret string
 
469
}
 
470
 
456
471
// MachineInfo holds the information about a Machine
457
472
// that is watched by StateWatcher.
458
473
type MachineInfo struct {
459
 
        Id         string `bson:"_id"`
460
 
        InstanceId string
461
 
        Status     Status
462
 
        StatusInfo string
463
 
        StatusData StatusData
 
474
        Id                       string `bson:"_id"`
 
475
        InstanceId               string
 
476
        Status                   Status
 
477
        StatusInfo               string
 
478
        StatusData               StatusData
 
479
        Life                     Life
 
480
        Series                   string
 
481
        SupportedContainers      []instance.ContainerType
 
482
        SupportedContainersKnown bool
 
483
        HardwareCharacteristics  *instance.HardwareCharacteristics `json:",omitempty"`
 
484
        Jobs                     []MachineJob
 
485
        Addresses                []instance.Address
464
486
}
465
487
 
466
488
func (i *MachineInfo) EntityId() EntityId {
582
604
        Config map[string]interface{}
583
605
}
584
606
 
 
607
// EnvironmentUnset contains the arguments for EnvironmentUnset client API
 
608
// call.
 
609
type EnvironmentUnset struct {
 
610
        Keys []string
 
611
}
 
612
 
585
613
// SetEnvironAgentVersion contains the arguments for
586
614
// SetEnvironAgentVersion client API call.
587
615
type SetEnvironAgentVersion struct {