OLD | NEW |
1 package main | 1 package main |
2 | 2 |
3 import ( | 3 import ( |
4 "launchpad.net/gnuflag" | 4 "launchpad.net/gnuflag" |
5 "launchpad.net/juju-core/cmd" | 5 "launchpad.net/juju-core/cmd" |
6 "launchpad.net/juju-core/environs" | 6 "launchpad.net/juju-core/environs" |
7 ) | 7 ) |
8 | 8 |
9 // BootstrapCommand is responsible for launching the first machine in a juju | 9 // BootstrapCommand is responsible for launching the first machine in a juju |
10 // environment, and setting up everything necessary to continue working. | 10 // environment, and setting up everything necessary to continue working. |
(...skipping 15 matching lines...) Expand all Loading... |
26 return cmd.CheckEmpty(f.Args()) | 26 return cmd.CheckEmpty(f.Args()) |
27 } | 27 } |
28 | 28 |
29 // Run connects to the environment specified on the command line and bootstraps | 29 // Run connects to the environment specified on the command line and bootstraps |
30 // a juju in that environment if none already exists. | 30 // a juju in that environment if none already exists. |
31 func (c *BootstrapCommand) Run(_ *cmd.Context) error { | 31 func (c *BootstrapCommand) Run(_ *cmd.Context) error { |
32 environ, err := environs.NewFromName(c.EnvName) | 32 environ, err := environs.NewFromName(c.EnvName) |
33 if err != nil { | 33 if err != nil { |
34 return err | 34 return err |
35 } | 35 } |
36 » return environ.Bootstrap(c.UploadTools) | 36 » // TODO (rog) use juju.Bootstrap |
| 37 » return environ.Bootstrap(c.UploadTools, []byte("fake cert")) |
37 } | 38 } |
OLD | NEW |