~rogpeppe/juju-core/041-config-agent-version

« back to all changes in this revision

Viewing changes to environs/ec2/ec2.go

  • Committer: Roger Peppe
  • Date: 2012-08-30 12:25:49 UTC
  • mfrom: (443.1.7 juju-core)
  • Revision ID: roger.peppe@canonical.com-20120830122549-jmn0ledsyj1uxhd2
merge trunk

Show diffs side-by-side

added added

removed removed

Lines of Context:
314
314
func (e *environ) userData(machineId int, info *state.Info, tools *state.Tools, master bool, config map[string]interface{}) ([]byte, error) {
315
315
        cfg := &cloudinit.MachineConfig{
316
316
                Provisioner:        master,
317
 
                ZooKeeper:          master,
 
317
                StateServer:        master,
318
318
                StateInfo:          info,
319
319
                InstanceIdAccessor: "$(curl http://169.254.169.254/1.0/meta-data/instance-id)",
320
320
                ProviderType:       "ec2",
600
600
        if err != nil {
601
601
                return fmt.Errorf("cannot open ports: %v", err)
602
602
        }
 
603
        log.Printf("environs/ec2: opened ports in security group %s: %v", g.Name, ports)
603
604
        return nil
604
605
}
605
606
 
615
616
        if err != nil {
616
617
                return fmt.Errorf("cannot close ports: %v", err)
617
618
        }
 
619
        log.Printf("environs/ec2: closed ports in security group %s: %v", g.Name, ports)
618
620
        return nil
619
621
}
620
622