environs/cloudinit: use --initial-password

worker/firewaller/firewaller_test.go

 package firewaller_test
 
 import (
         . "launchpad.net/gocheck"
         "launchpad.net/juju-core/environs"
         "launchpad.net/juju-core/environs/dummy"
         "launchpad.net/juju-core/juju/testing"
         "launchpad.net/juju-core/state"
         coretesting "launchpad.net/juju-core/testing"
         "launchpad.net/juju-core/worker/firewaller"
@@ skipping 54 matching lines @@
         units, err := s.Conn.AddUnits(svc, 1)
         c.Assert(err, IsNil)
         u := units[0]
         id, err := u.AssignedMachineId()
         c.Assert(err, IsNil)
         m, err := s.State.Machine(id)
         c.Assert(err, IsNil)
         return u, m
 }
 
+func (s *FirewallerSuite) StateInfo(c *C, m *state.Machine) *state.Info {
+        info := s.JujuConnSuite.StateInfo(c)
+        info.EntityName = m.EntityName()
+        info.Password = "irrelevant"
+        return info
+}
+
 // startInstance starts a new instance for the given machine.
 func (s *FirewallerSuite) startInstance(c *C, m *state.Machine) environs.Instance {
-        inst, err := s.Conn.Environ.StartInstance(m.Id(), s.StateInfo(c), nil)
+        inst, err := s.Conn.Environ.StartInstance(m.Id(), s.StateInfo(c, m), nil)
         c.Assert(err, IsNil)
         err = m.SetInstanceId(inst.Id())
         c.Assert(err, IsNil)
         return inst
 }
 
 func (s *FirewallerSuite) TestNotExposedService(c *C) {
         fw := firewaller.NewFirewaller(s.State)
         defer func() { c.Assert(fw.Stop(), IsNil) }()
 
@@ skipping 156 matching lines @@
 
         s.assertPorts(c, inst, m.Id(), []state.Port{{"tcp", 80}, {"tcp", 8080}})
 
         err = svc.SetExposed()
         c.Assert(err, IsNil)
 }
 
 func (s *FirewallerSuite) TestFirewallerStartWithPartialState(c *C) {
         m, err := s.State.AddMachine(state.MachinerWorker)
         c.Assert(err, IsNil)
-        inst, err := s.Conn.Environ.StartInstance(m.Id(), s.StateInfo(c), nil)
+        inst, err := s.Conn.Environ.StartInstance(m.Id(), s.StateInfo(c, m), nil)
         c.Assert(err, IsNil)
         err = m.SetInstanceId(inst.Id())
         c.Assert(err, IsNil)
 
         svc, err := s.State.AddService("wordpress", s.charm)
         c.Assert(err, IsNil)
         err = svc.SetExposed()
         c.Assert(err, IsNil)
 
         // Starting the firewaller, no open ports.
@@ skipping 210 matching lines @@
         c.Assert(err, IsNil)
 
         // Remove machine. Nothing bad should happen, but can't
         // assert port state since the machine must have been
         // destroyed and we lost its reference.
         err = m.EnsureDead()
         c.Assert(err, IsNil)
         err = s.State.RemoveMachine(m.Id())
         c.Assert(err, IsNil)
 }