state: add CACert to Info.

environs/cloudinit/cloudinit.go

 package cloudinit
 
 import (
         "encoding/base64"
         "fmt"
         "launchpad.net/goyaml"
         "launchpad.net/juju-core/cloudinit"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/config"
         "launchpad.net/juju-core/log"
@@ skipping 11 matching lines @@
 var mgoPortSuffix = fmt.Sprintf(":%d", mgoPort)
 
 // MachineConfig represents initialization information for a new juju machine.
 // Creation of cloudinit data from this struct is largely provider-independent,
 // but we'll keep it internal until we need to factor it out.
 type MachineConfig struct {
         // StateServer specifies whether the new machine will run a ZooKeeper
         // or MongoDB instance.
         StateServer bool
 
-        // StateServerCertPEM and StateServerKeyPEM hold the state server
+        // StateServerCert and StateServerKey hold the state server
         // certificate and private key in PEM format; they are required when
         // StateServer is set, and ignored otherwise.
-        StateServerCertPEM []byte
-        StateServerKeyPEM  []byte
+        StateServerCert []byte
+        StateServerKey  []byte
 
         // InstanceIdAccessor holds bash code that evaluates to the current instance id.
         InstanceIdAccessor string
 
         // ProviderType identifies the provider type so the host
         // knows which kind of provider to use.
         ProviderType string
 
         // StateInfo holds the means for the new instance to communicate with the
         // juju state. Unless the new machine is running a state server (StateServer is
@@ skipping 65 matching lines @@
 
         debugFlag := ""
         // TODO: disable debug mode by default when the system is stable.
         if true || log.Debug {
                 debugFlag = " --debug"
         }
 
         if cfg.StateServer {
                 addScripts(c,
                         fmt.Sprintf("echo %s > %s",
-                                shquote(string(cfg.StateServerCertPEM)+string(cfg.StateServerKeyPEM)), serverPEMPath),
+                                shquote(string(cfg.StateServerCert)+string(cfg.StateServerKey)), serverPEMPath),
                         "chmod 600 "+serverPEMPath,
                 )
 
                 // TODO The public bucket must come from the environment configuration.
                 b := cfg.Tools.Binary
                 url := fmt.Sprintf("http://juju-dist.s3.amazonaws.com/tools/mongo-2.2.0-%s-%s.tgz", b.Series, b.Arch)
                 addScripts(c,
                         "mkdir -p /opt",
                         fmt.Sprintf("wget --no-verbose -O - %s | tar xz -C /opt", shquote(url)),
                 )
@@ skipping 151 matching lines @@
         if cfg.StateServer {
                 if cfg.InstanceIdAccessor == "" {
                         return fmt.Errorf("missing instance id accessor")
                 }
                 if cfg.Config == nil {
                         return fmt.Errorf("missing environment configuration")
                 }
                 if cfg.StateInfo.EntityName != "" {
                         return fmt.Errorf("entity name must be blank when starting a state server")
                 }
-                if len(cfg.StateServerCertPEM) == 0 {
+                if len(cfg.StateServerCert) == 0 {
                         return fmt.Errorf("missing state server certificate")
                 }
-                if len(cfg.StateServerKeyPEM) == 0 {
+                if len(cfg.StateServerKey) == 0 {
                         return fmt.Errorf("missing state server private key")
                 }
         } else {
                 if len(cfg.StateInfo.Addrs) == 0 {
                         return fmt.Errorf("missing state hosts")
                 }
                 if cfg.StateInfo.EntityName != state.MachineEntityName(cfg.MachineId) {
                         return fmt.Errorf("entity name must match started machine")
                 }
         }
         for _, r := range cfg.StateInfo.Password {
                 if r == '\'' || r == '\\' || r < 32 {
                         return fmt.Errorf("password has disallowed characters")
                 }
         }
         return nil
 }