1
=== modified file 'cloudinit/cloudinit_test.go'
2
--- cloudinit/cloudinit_test.go	2013-11-26 12:24:48 +0000
3
+++ cloudinit/cloudinit_test.go	2013-12-03 06:15:09 +0000
4
@@ -269,6 +269,37 @@
5
269
	c.Assert(cfg.Packages(), gc.DeepEquals, []string{"a b c", "d!"})
269
	c.Assert(cfg.Packages(), gc.DeepEquals, []string{"a b c", "d!"})
6
270
}
270
}
7
271
271
8
272
func (S) TestSetOutput(c *gc.C) {
9
273
	type test struct {
10
274
		kind   cloudinit.OutputKind
11
275
		stdout string
12
276
		stderr string
13
277
	}
14
278
	tests := []test{{
15
279
		cloudinit.OutAll, "a", "",
16
280
	}, {
17
281
		cloudinit.OutAll, "", "b",
18
282
	}, {
19
283
		cloudinit.OutInit, "a", "b",
20
284
	}, {
21
285
		cloudinit.OutAll, "a", "b",
22
286
	}, {
23
287
		cloudinit.OutAll, "", "",
24
288
	}}
25
289
26
290
	cfg := cloudinit.New()
27
291
	stdout, stderr := cfg.Output(cloudinit.OutAll)
28
292
	c.Assert(stdout, gc.Equals, "")
29
293
	c.Assert(stderr, gc.Equals, "")
30
294
	for i, t := range tests {
31
295
		c.Logf("test %d: %+v", i, t)
32
296
		cfg.SetOutput(t.kind, t.stdout, t.stderr)
33
297
		stdout, stderr = cfg.Output(t.kind)
34
298
		c.Assert(stdout, gc.Equals, t.stdout)
35
299
		c.Assert(stderr, gc.Equals, t.stderr)
36
300
	}
37
301
}
38
302
39
272
//#cloud-config
303
//#cloud-config
40
273
//packages:
304
//packages:
41
274
//- juju
305
//- juju
42
275
306
43
=== modified file 'cloudinit/options.go'
44
--- cloudinit/options.go	2013-11-26 12:24:48 +0000
45
+++ cloudinit/options.go	2013-12-03 06:15:09 +0000
46
@@ -31,6 +31,13 @@
47
31
	cfg.set("apt_upgrade", yes, yes)
31
	cfg.set("apt_upgrade", yes, yes)
48
32
}
32
}
49
33
33
50
34
// AptUpgrade returns the value set by SetAptUpgrade, or
51
35
// false if no call to SetAptUpgrade has been made.
52
36
func (cfg *Config) AptUpgrade() bool {
53
37
	update, _ := cfg.attrs["apt_upgrade"].(bool)
54
38
	return update
55
39
}
56
40
57
34
// SetUpdate sets whether cloud-init runs "apt-get update"
41
// SetUpdate sets whether cloud-init runs "apt-get update"
58
35
// on first boot.
42
// on first boot.
59
36
func (cfg *Config) SetAptUpdate(yes bool) {
43
func (cfg *Config) SetAptUpdate(yes bool) {
60
@@ -233,6 +240,20 @@
61
233
	cfg.attrs["output"] = out
240
	cfg.attrs["output"] = out
62
234
}
241
}
63
235
242
64
243
// Output returns the output destination passed to SetOutput for
65
244
// the specified output kind.
66
245
func (cfg *Config) Output(kind OutputKind) (stdout, stderr string) {
67
246
	if out, ok := cfg.attrs["output"].(map[string]interface{}); ok {
68
247
		switch out := out[string(kind)].(type) {
69
248
		case string:
70
249
			stdout = out
71
250
		case []string:
72
251
			stdout, stderr = out[0], out[1]
73
252
		}
74
253
	}
75
254
	return stdout, stderr
76
255
}
77
256
78
236
// AddSSHKey adds a pre-generated ssh key to the
257
// AddSSHKey adds a pre-generated ssh key to the
79
237
// server keyring. Keys that are added like this will be
258
// server keyring. Keys that are added like this will be
80
238
// written to /etc/ssh and new random keys will not
259
// written to /etc/ssh and new random keys will not
81
239
260
82
=== added file 'cloudinit/progress.go'
83
--- cloudinit/progress.go	1970-01-01 00:00:00 +0000
84
+++ cloudinit/progress.go	2013-12-03 06:15:09 +0000
85
@@ -0,0 +1,43 @@
86
1
// Copyright 2013 Canonical Ltd.
87
2
// Licensed under the AGPLv3, see LICENCE file for details.
88
3
89
4
package cloudinit
90
5
91
6
import (
92
7
	"fmt"
93
8
94
9
	"launchpad.net/juju-core/utils"
95
10
)
96
11
97
12
// progressFd is the file descriptor to which progress is logged.
98
13
// This is necessary so that we can redirect all non-progress
99
14
// related stderr away.
100
15
//
101
16
// Note, from the Bash manual:
102
17
//   "Redirections using file descriptors greater than 9 should be
103
18
//   used with care, as they may conflict with file descriptors the
104
19
//   shell uses internally."
105
20
const progressFd = 9
106
21
107
22
// InitProgressCmd will return a command to initialise progress
108
23
// reporting, sending messages to stderr. If LogProgressCmd is
109
24
// used in a script, InitProgressCmd MUST be executed beforehand.
110
25
//
111
26
// The returned command is idempotent; this is important, to
112
27
// allow a script to be embedded in another with stderr redirected,
113
28
// in which case InitProgressCmd must precede the redirection.
114
29
func InitProgressCmd() string {
115
30
	return fmt.Sprintf("test -e /proc/self/fd/%d || exec %d>&2", progressFd, progressFd)
116
31
}
117
32
118
33
// LogProgressCmd will return a command to log the specified progress
119
34
// message to stderr; the resultant command should be added to the
120
35
// configuration as a runcmd or bootcmd as appropriate.
121
36
//
122
37
// If there are any uses of LogProgressCmd in a configuration, the
123
38
// configuration MUST precede the command with the result of
124
39
// InitProgressCmd.
125
40
func LogProgressCmd(format string, args ...interface{}) string {
126
41
	msg := utils.ShQuote(fmt.Sprintf(format, args...))
127
42
	return fmt.Sprintf("echo %s >&%d", msg, progressFd)
128
43
}
129
0
44
130
=== added file 'cloudinit/progress_test.go'
131
--- cloudinit/progress_test.go	1970-01-01 00:00:00 +0000
132
+++ cloudinit/progress_test.go	2013-12-03 06:15:09 +0000
133
@@ -0,0 +1,27 @@
134
1
// Copyright 2011, 2012, 2013 Canonical Ltd.
135
2
// Licensed under the AGPLv3, see LICENCE file for details.
136
3
137
4
package cloudinit_test
138
5
139
6
import (
140
7
	"regexp"
141
8
142
9
	gc "launchpad.net/gocheck"
143
10
144
11
	"launchpad.net/juju-core/cloudinit"
145
12
)
146
13
147
14
type progressSuite struct{}
148
15
149
16
var _ = gc.Suite(&progressSuite{})
150
17
151
18
func (*progressSuite) TestProgressCmds(c *gc.C) {
152
19
	initCmd := cloudinit.InitProgressCmd()
153
20
	re := regexp.MustCompile(`test -e /proc/self/fd/([0-9]+) \|\| exec ([0-9]+)>&2`)
154
21
	submatch := re.FindStringSubmatch(initCmd)
155
22
	c.Assert(submatch, gc.HasLen, 3)
156
23
	c.Assert(submatch[0], gc.Equals, initCmd)
157
24
	c.Assert(submatch[1], gc.Equals, submatch[2])
158
25
	logCmd := cloudinit.LogProgressCmd("he'llo\"!")
159
26
	c.Assert(logCmd, gc.Equals, `echo 'he'"'"'llo"!' >&`+submatch[1])
160
27
}
161
0
28
162
=== added directory 'cloudinit/sshinit'
163
=== renamed file 'environs/manual/agent.go' => 'cloudinit/sshinit/configure.go'
164
--- environs/manual/agent.go	2013-11-14 08:27:15 +0000
165
+++ cloudinit/sshinit/configure.go	2013-12-03 06:15:09 +0000
166
@@ -1,7 +1,7 @@
167
1
// Copyright 2013 Canonical Ltd.
1
// Copyright 2013 Canonical Ltd.
168
2
// Licensed under the AGPLv3, see LICENCE file for details.
2
// Licensed under the AGPLv3, see LICENCE file for details.
169
3
3
171
4
package manual
4
package sshinit
172
5
5
173
6
import (
6
import (
174
7
	"encoding/base64"
7
	"encoding/base64"
175
@@ -9,25 +9,29 @@
176
9
	"os"
9
	"os"
177
10
	"strings"
10
	"strings"
178
11
11
181
12
	corecloudinit "launchpad.net/juju-core/cloudinit"
12
	"launchpad.net/loggo"
182
13
	"launchpad.net/juju-core/environs/cloudinit"
13
183
14
	"launchpad.net/juju-core/cloudinit"
184
14
	"launchpad.net/juju-core/utils"
15
	"launchpad.net/juju-core/utils"
185
16
	"launchpad.net/juju-core/utils/ssh"
186
15
)
17
)
187
16
18
191
17
// ProvisionMachineAgent connects to a machine over SSH,
19
var logger = loggo.GetLogger("juju.cloudinit.sshinit")
192
18
// and installs a machine agent.
20
193
19
func ProvisionMachineAgent(host string, mcfg *cloudinit.MachineConfig) error {
21
// Configure connects to the specified host over SSH,
194
22
// and executes a script that carries out cloud-config.
195
23
func Configure(host string, cfg *cloudinit.Config) error {
196
20
	logger.Infof("Provisioning machine agent on %s", host)
24
	logger.Infof("Provisioning machine agent on %s", host)
198
21
	script, err := provisionMachineAgentScript(mcfg)
25
	script, err := generateScript(cfg)
199
22
	if err != nil {
26
	if err != nil {
200
23
		return err
27
		return err
201
24
	}
28
	}
202
25
	scriptBase64 := base64.StdEncoding.EncodeToString([]byte(script))
29
	scriptBase64 := base64.StdEncoding.EncodeToString([]byte(script))
203
26
	script = fmt.Sprintf(`F=$(mktemp); echo %s | base64 -d > $F; . $F`, scriptBase64)
30
	script = fmt.Sprintf(`F=$(mktemp); echo %s | base64 -d > $F; . $F`, scriptBase64)
205
27
	cmd := sshCommand(
31
	cmd := ssh.Command(
206
28
		host,
32
		host,
209
29
		fmt.Sprintf("sudo bash -c '%s'", script),
33
		[]string{"sudo", fmt.Sprintf("bash -c '%s'", script)},
210
30
		allocateTTY,
34
		ssh.AllocateTTY,
211
31
	)
35
	)
212
32
	cmd.Stdout = os.Stdout
36
	cmd.Stdout = os.Stdout
213
33
	cmd.Stderr = os.Stderr
37
	cmd.Stderr = os.Stderr
214
@@ -35,17 +39,9 @@
215
35
	return cmd.Run()
39
	return cmd.Run()
216
36
}
40
}
217
37
41
229
38
// provisionMachineAgentScript generates the script necessary
42
// generateScript generates the script that applies
230
39
// to install a machine agent with the provided MachineConfig.
43
// the specified cloud-config.
231
40
func provisionMachineAgentScript(mcfg *cloudinit.MachineConfig) (string, error) {
44
func generateScript(cloudcfg *cloudinit.Config) (string, error) {
221
41
	// We generate a cloud-init config, which we'll then pull the runcmds
222
42
	// and prerequisite packages out of. Rather than generating a cloud-config,
223
43
	// we'll just generate a shell script.
224
44
	cloudcfg := corecloudinit.New()
225
45
	if err := cloudinit.Configure(mcfg, cloudcfg); err != nil {
226
46
		return "", err
227
47
	}
228
48
232
49
	// TODO(axw): 2013-08-23 bug 1215777
45
	// TODO(axw): 2013-08-23 bug 1215777
233
50
	// Carry out configuration for ssh-keys-per-user,
46
	// Carry out configuration for ssh-keys-per-user,
234
51
	// machine-updates-authkeys, using cloud-init config.
47
	// machine-updates-authkeys, using cloud-init config.
235
@@ -78,23 +74,38 @@
236
78
	// We prepend "set -xe". This is already in runcmds,
74
	// We prepend "set -xe". This is already in runcmds,
237
79
	// but added here to avoid relying on that to be
75
	// but added here to avoid relying on that to be
238
80
	// invariant.
76
	// invariant.
240
81
	script := []string{"#!/bin/bash", "set -xe"}
77
	script := []string{"#!/bin/bash", "set -e"}
241
78
	// We must initialise progress reporting before entering
242
79
	// the subshell and redirecting stderr.
243
80
	script = append(script, cloudinit.InitProgressCmd())
244
81
	stdout, stderr := cloudcfg.Output(cloudinit.OutAll)
245
82
	script = append(script, "(")
246
83
	if stderr != "" {
247
84
		script = append(script, "(")
248
85
	}
249
82
	script = append(script, bootcmds...)
86
	script = append(script, bootcmds...)
250
83
	script = append(script, pkgcmds...)
87
	script = append(script, pkgcmds...)
251
84
	script = append(script, runcmds...)
88
	script = append(script, runcmds...)
252
89
	if stderr != "" {
253
90
		script = append(script, ") "+stdout)
254
91
		script = append(script, ") "+stderr)
255
92
	} else {
256
93
		script = append(script, ") "+stdout+" 2>&1")
257
94
	}
258
85
	return strings.Join(script, "\n"), nil
95
	return strings.Join(script, "\n"), nil
259
86
}
96
}
260
87
97
261
88
// addPackageCommands returns a slice of commands that, when run,
98
// addPackageCommands returns a slice of commands that, when run,
262
89
// will add the required apt repositories and packages.
99
// will add the required apt repositories and packages.
264
90
func addPackageCommands(cfg *corecloudinit.Config) ([]string, error) {
100
func addPackageCommands(cfg *cloudinit.Config) ([]string, error) {
265
91
	var cmds []string
101
	var cmds []string
266
92
	if len(cfg.AptSources()) > 0 {
102
	if len(cfg.AptSources()) > 0 {
268
93
		// Ensure apt-add-repository is available.
103
		// Ensure add-apt-repository is available.
269
104
		cmds = append(cmds, cloudinit.LogProgressCmd("Installing add-apt-repository"))
270
94
		cmds = append(cmds, "apt-get -y install python-software-properties")
105
		cmds = append(cmds, "apt-get -y install python-software-properties")
271
95
	}
106
	}
272
96
	for _, src := range cfg.AptSources() {
107
	for _, src := range cfg.AptSources() {
274
97
		// PPA keys are obtained by apt-add-repository, from launchpad.
108
		// PPA keys are obtained by add-apt-repository, from launchpad.
275
98
		if !strings.HasPrefix(src.Source, "ppa:") {
109
		if !strings.HasPrefix(src.Source, "ppa:") {
276
99
			if src.Key != "" {
110
			if src.Key != "" {
277
100
				key := utils.ShQuote(src.Key)
111
				key := utils.ShQuote(src.Key)
278
@@ -102,14 +113,19 @@
279
102
				cmds = append(cmds, cmd)
113
				cmds = append(cmds, cmd)
280
103
			}
114
			}
281
104
		}
115
		}
283
105
		cmds = append(cmds, "apt-add-repository -y "+utils.ShQuote(src.Source))
116
		cmds = append(cmds, cloudinit.LogProgressCmd("Adding apt repository: %s", src.Source))
284
117
		cmds = append(cmds, "add-apt-repository -y "+utils.ShQuote(src.Source))
285
106
	}
118
	}
287
107
	if len(cfg.AptSources()) > 0 {
119
	if len(cfg.AptSources()) > 0 || cfg.AptUpdate() {
288
120
		cmds = append(cmds, cloudinit.LogProgressCmd("Running apt-get update"))
289
108
		cmds = append(cmds, "apt-get -y update")
121
		cmds = append(cmds, "apt-get -y update")
290
109
	}
122
	}
293
110
	// Note: explicitly ignoring apt_upgrade, so as not to trample the target
123
	if cfg.AptUpgrade() {
294
111
	// machine's existing configuration.
124
		cmds = append(cmds, cloudinit.LogProgressCmd("Running apt-get upgrade"))
295
125
		cmds = append(cmds, "apt-get -y upgrade")
296
126
	}
297
112
	for _, pkg := range cfg.Packages() {
127
	for _, pkg := range cfg.Packages() {
298
128
		cmds = append(cmds, cloudinit.LogProgressCmd("Installing package: %s", pkg))
299
113
		cmd := fmt.Sprintf("apt-get -y install %s", utils.ShQuote(pkg))
129
		cmd := fmt.Sprintf("apt-get -y install %s", utils.ShQuote(pkg))
300
114
		cmds = append(cmds, cmd)
130
		cmds = append(cmds, cmd)
301
115
	}
131
	}
302
116
132
303
=== renamed file 'environs/manual/agent_test.go' => 'cloudinit/sshinit/configure_test.go'
304
--- environs/manual/agent_test.go	2013-11-14 08:27:15 +0000
305
+++ cloudinit/sshinit/configure_test.go	2013-12-03 06:15:09 +0000
306
@@ -1,35 +1,46 @@
307
1
// Copyright 2013 Canonical Ltd.
1
// Copyright 2013 Canonical Ltd.
308
2
// Licensed under the AGPLv3, see LICENCE file for details.
2
// Licensed under the AGPLv3, see LICENCE file for details.
309
3
3
311
4
package manual
4
package sshinit
312
5
5
313
6
import (
6
import (
314
7
	gc "launchpad.net/gocheck"
7
	gc "launchpad.net/gocheck"
315
8
8
316
9
	"launchpad.net/juju-core/cloudinit"
317
9
	"launchpad.net/juju-core/constraints"
10
	"launchpad.net/juju-core/constraints"
318
10
	"launchpad.net/juju-core/environs"
11
	"launchpad.net/juju-core/environs"
320
11
	"launchpad.net/juju-core/environs/cloudinit"
12
	envcloudinit "launchpad.net/juju-core/environs/cloudinit"
321
12
	"launchpad.net/juju-core/environs/config"
13
	"launchpad.net/juju-core/environs/config"
322
13
	envtools "launchpad.net/juju-core/environs/tools"
14
	envtools "launchpad.net/juju-core/environs/tools"
323
14
	_ "launchpad.net/juju-core/provider/dummy"
324
15
	coretesting "launchpad.net/juju-core/testing"
15
	coretesting "launchpad.net/juju-core/testing"
325
16
	"launchpad.net/juju-core/testing/testbase"
16
	"launchpad.net/juju-core/testing/testbase"
326
17
	"launchpad.net/juju-core/tools"
17
	"launchpad.net/juju-core/tools"
327
18
	"launchpad.net/juju-core/version"
18
	"launchpad.net/juju-core/version"
328
19
)
19
)
329
20
20
331
21
type agentSuite struct {
21
type configureSuite struct {
332
22
	testbase.LoggingSuite
22
	testbase.LoggingSuite
333
23
}
23
}
334
24
24
338
25
var _ = gc.Suite(&agentSuite{})
25
var _ = gc.Suite(&configureSuite{})
339
26
26
340
27
func dummyConfig(c *gc.C, stateServer bool, vers version.Binary) *config.Config {
27
type testProvider struct {
341
28
	environs.EnvironProvider
342
29
}
343
30
344
31
func (p *testProvider) SecretAttrs(cfg *config.Config) (map[string]string, error) {
345
32
	return map[string]string{}, nil
346
33
}
347
34
348
35
func init() {
349
36
	environs.RegisterProvider("sshinit_test", &testProvider{})
350
37
}
351
38
352
39
func testConfig(c *gc.C, stateServer bool, vers version.Binary) *config.Config {
353
28
	testConfig, err := config.New(config.UseDefaults, coretesting.FakeConfig())
40
	testConfig, err := config.New(config.UseDefaults, coretesting.FakeConfig())
354
29
	c.Assert(err, gc.IsNil)
41
	c.Assert(err, gc.IsNil)
355
30
	testConfig, err = testConfig.Apply(map[string]interface{}{
42
	testConfig, err = testConfig.Apply(map[string]interface{}{
358
31
		"type":           "dummy",
43
		"type":           "sshinit_test",
357
32
		"state-server":   stateServer,
359
33
		"default-series": vers.Series,
44
		"default-series": vers.Series,
360
34
		"agent-version":  vers.Number.String(),
45
		"agent-version":  vers.Number.String(),
361
35
	})
46
	})
362
@@ -37,8 +48,8 @@
363
37
	return testConfig
48
	return testConfig
364
38
}
49
}
365
39
50
368
40
func (s *agentSuite) getMachineConfig(c *gc.C, stateServer bool, vers version.Binary) *cloudinit.MachineConfig {
51
func (s *configureSuite) getCloudConfig(c *gc.C, stateServer bool, vers version.Binary) *cloudinit.Config {
369
41
	var mcfg *cloudinit.MachineConfig
52
	var mcfg *envcloudinit.MachineConfig
370
42
	if stateServer {
53
	if stateServer {
371
43
		mcfg = environs.NewBootstrapMachineConfig("http://whatever/dotcom")
54
		mcfg = environs.NewBootstrapMachineConfig("http://whatever/dotcom")
372
44
	} else {
55
	} else {
373
@@ -48,10 +59,13 @@
374
48
		Version: vers,
59
		Version: vers,
375
49
		URL:     "file:///var/lib/juju/storage/" + envtools.StorageName(vers),
60
		URL:     "file:///var/lib/juju/storage/" + envtools.StorageName(vers),
376
50
	}
61
	}
378
51
	environConfig := dummyConfig(c, stateServer, vers)
62
	environConfig := testConfig(c, stateServer, vers)
379
52
	err := environs.FinishMachineConfig(mcfg, environConfig, constraints.Value{})
63
	err := environs.FinishMachineConfig(mcfg, environConfig, constraints.Value{})
380
53
	c.Assert(err, gc.IsNil)
64
	c.Assert(err, gc.IsNil)
382
54
	return mcfg
65
	cloudcfg := cloudinit.New()
383
66
	err = envcloudinit.Configure(mcfg, cloudcfg)
384
67
	c.Assert(err, gc.IsNil)
385
68
	return cloudcfg
386
55
}
69
}
387
56
70
388
57
var allSeries = [...]string{"precise", "quantal", "raring", "saucy"}
71
var allSeries = [...]string{"precise", "quantal", "raring", "saucy"}
389
@@ -63,10 +77,10 @@
390
63
	return gc.Not(checker)
77
	return gc.Not(checker)
391
64
}
78
}
392
65
79
394
66
func (s *agentSuite) TestAptSources(c *gc.C) {
80
func (s *configureSuite) TestAptSources(c *gc.C) {
395
67
	for _, series := range allSeries {
81
	for _, series := range allSeries {
396
68
		vers := version.MustParseBinary("1.16.0-" + series + "-amd64")
82
		vers := version.MustParseBinary("1.16.0-" + series + "-amd64")
398
69
		script, err := provisionMachineAgentScript(s.getMachineConfig(c, true, vers))
83
		script, err := generateScript(s.getCloudConfig(c, true, vers))
399
70
		c.Assert(err, gc.IsNil)
84
		c.Assert(err, gc.IsNil)
400
71
85
401
72
		// Only Precise requires the cloud-tools pocket.
86
		// Only Precise requires the cloud-tools pocket.
402
@@ -82,7 +96,7 @@
403
82
		c.Assert(
96
		c.Assert(
404
83
			script,
97
			script,
405
84
			checkIff(gc.Matches, needsCloudTools),
98
			checkIff(gc.Matches, needsCloudTools),
407
85
			"(.|\n)*apt-add-repository.*cloud-tools(.|\n)*",
99
			"(.|\n)*add-apt-repository.*cloud-tools(.|\n)*",
408
86
		)
100
		)
409
87
101
410
88
		// Only Quantal requires the PPA (for mongo).
102
		// Only Quantal requires the PPA (for mongo).
411
@@ -90,10 +104,10 @@
412
90
		c.Assert(
104
		c.Assert(
413
91
			script,
105
			script,
414
92
			checkIff(gc.Matches, needsJujuPPA),
106
			checkIff(gc.Matches, needsJujuPPA),
416
93
			"(.|\n)*apt-add-repository.*ppa:juju/stable(.|\n)*",
107
			"(.|\n)*add-apt-repository.*ppa:juju/stable(.|\n)*",
417
94
		)
108
		)
418
95
109
420
96
		// Only install python-software-properties (apt-add-repository)
110
		// Only install python-software-properties (add-apt-repository)
421
97
		// if we need to.
111
		// if we need to.
422
98
		c.Assert(
112
		c.Assert(
423
99
			script,
113
			script,
424
@@ -102,3 +116,39 @@
425
102
		)
116
		)
426
103
	}
117
	}
427
104
}
118
}
428
119
429
120
func assertScriptMatches(c *gc.C, cfg *cloudinit.Config, pattern string, match bool) {
430
121
	script, err := generateScript(cfg)
431
122
	c.Assert(err, gc.IsNil)
432
123
	checker := gc.Matches
433
124
	if !match {
434
125
		checker = gc.Not(checker)
435
126
	}
436
127
	c.Assert(script, checker, pattern)
437
128
}
438
129
439
130
func (s *configureSuite) TestAptUpdate(c *gc.C) {
440
131
	// apt-get update is run if either AptUpdate is set,
441
132
	// or apt sources are defined.
442
133
	const aptGetUpdatePattern = "(.|\n)*apt-get -y update(.|\n)*"
443
134
	cfg := cloudinit.New()
444
135
	c.Assert(cfg.AptUpdate(), gc.Equals, false)
445
136
	c.Assert(cfg.AptSources(), gc.HasLen, 0)
446
137
	assertScriptMatches(c, cfg, aptGetUpdatePattern, false)
447
138
	cfg.SetAptUpdate(true)
448
139
	assertScriptMatches(c, cfg, aptGetUpdatePattern, true)
449
140
	cfg.SetAptUpdate(false)
450
141
	cfg.AddAptSource("source", "key")
451
142
	assertScriptMatches(c, cfg, aptGetUpdatePattern, true)
452
143
}
453
144
454
145
func (s *configureSuite) TestAptUpgrade(c *gc.C) {
455
146
	// apt-get upgrade is only run if AptUpgrade is set.
456
147
	const aptGetUpgradePattern = "(.|\n)*apt-get -y upgrade(.|\n)*"
457
148
	cfg := cloudinit.New()
458
149
	cfg.SetAptUpdate(true)
459
150
	cfg.AddAptSource("source", "key")
460
151
	assertScriptMatches(c, cfg, aptGetUpgradePattern, false)
461
152
	cfg.SetAptUpgrade(true)
462
153
	assertScriptMatches(c, cfg, aptGetUpgradePattern, true)
463
154
}
464
105
155
465
=== added file 'cloudinit/sshinit/suite_test.go'
466
--- cloudinit/sshinit/suite_test.go	1970-01-01 00:00:00 +0000
467
+++ cloudinit/sshinit/suite_test.go	2013-12-03 06:15:09 +0000
468
@@ -0,0 +1,14 @@
469
1
// Copyright 2013 Canonical Ltd.
470
2
// Licensed under the AGPLv3, see LICENCE file for details.
471
3
472
4
package sshinit
473
5
474
6
import (
475
7
	stdtesting "testing"
476
8
477
9
	gc "launchpad.net/gocheck"
478
10
)
479
11
480
12
func Test(t *stdtesting.T) {
481
13
	gc.TestingT(t)
482
14
}
483
0
15
484
=== modified file 'cmd/juju/debughooks.go'
485
--- cmd/juju/debughooks.go	2013-11-28 11:57:57 +0000
486
+++ cmd/juju/debughooks.go	2013-12-03 06:15:09 +0000
487
@@ -146,7 +146,7 @@
488
146
	debugctx := unitdebug.NewHooksContext(c.Target)
146
	debugctx := unitdebug.NewHooksContext(c.Target)
489
147
	script := base64.StdEncoding.EncodeToString([]byte(unitdebug.ClientScript(debugctx, c.hooks)))
147
	script := base64.StdEncoding.EncodeToString([]byte(unitdebug.ClientScript(debugctx, c.hooks)))
490
148
	innercmd := fmt.Sprintf(`F=$(mktemp); echo %s | base64 -d > $F; . $F`, script)
148
	innercmd := fmt.Sprintf(`F=$(mktemp); echo %s | base64 -d > $F; . $F`, script)
492
149
	args := []string{"--", fmt.Sprintf("sudo /bin/bash -c '%s'", innercmd)}
149
	args := []string{fmt.Sprintf("sudo /bin/bash -c '%s'", innercmd)}
493
150
	c.Args = args
150
	c.Args = args
494
151
	return c.SSHCommand.Run(ctx)
151
	return c.SSHCommand.Run(ctx)
495
152
}
152
}
496
153
153
497
=== modified file 'cmd/juju/debughooks_test.go'
498
--- cmd/juju/debughooks_test.go	2013-11-08 04:45:20 +0000
499
+++ cmd/juju/debughooks_test.go	2013-12-03 06:15:09 +0000
500
@@ -19,7 +19,7 @@
501
19
	SSHCommonSuite
19
	SSHCommonSuite
502
20
}
20
}
503
21
21
505
22
const debugHooksArgs = `-l ubuntu -t ` + commonArgs
22
const debugHooksArgs = sshArgs
506
23
23
507
24
var debugHooksTests = []struct {
24
var debugHooksTests = []struct {
508
25
	info   string
25
	info   string
509
@@ -29,10 +29,10 @@
510
29
	stderr string
29
	stderr string
511
30
}{{
30
}{{
512
31
	args:   []string{"mysql/0"},
31
	args:   []string{"mysql/0"},
514
32
	result: regexp.QuoteMeta(debugHooksArgs + "dummyenv-0.dns -- sudo /bin/bash -c 'F=$(mktemp); echo IyEvYmluL2Jhc2gKKAojIExvY2sgdGhlIGp1anUtPHVuaXQ+LWRlYnVnIGxvY2tmaWxlLgpmbG9jayAtbiA4IHx8IChlY2hvICJGYWlsZWQgdG8gYWNxdWlyZSAvdG1wL2p1anUtdW5pdC1teXNxbC0wLWRlYnVnLWhvb2tzOiB1bml0IGlzIGFscmVhZHkgYmVpbmcgZGVidWdnZWQiIDI+JjE7IGV4aXQgMSkKKAojIENsb3NlIHRoZSBpbmhlcml0ZWQgbG9jayBGRCwgb3IgdG11eCB3aWxsIGtlZXAgaXQgb3Blbi4KZXhlYyA4PiYtCgojIFdyaXRlIG91dCB0aGUgZGVidWctaG9va3MgYXJncy4KZWNobyAiZTMwSyIgfCBiYXNlNjQgLWQgPiAvdG1wL2p1anUtdW5pdC1teXNxbC0wLWRlYnVnLWhvb2tzCgojIExvY2sgdGhlIGp1anUtPHVuaXQ+LWRlYnVnLWV4aXQgbG9ja2ZpbGUuCmZsb2NrIC1uIDkgfHwgZXhpdCAxCgojIFdhaXQgZm9yIHRtdXggdG8gYmUgaW5zdGFsbGVkLgp3aGlsZSBbICEgLWYgL3Vzci9iaW4vdG11eCBdOyBkbwogICAgc2xlZXAgMQpkb25lCgppZiBbICEgLWYgfi8udG11eC5jb25mIF07IHRoZW4KICAgICAgICBpZiBbIC1mIC91c3Ivc2hhcmUvYnlvYnUvcHJvZmlsZXMvdG11eCBdOyB0aGVuCiAgICAgICAgICAgICAgICAjIFVzZSBieW9idS90bXV4IHByb2ZpbGUgZm9yIGZhbWlsaWFyIGtleWJpbmRpbmdzIGFuZCBicmFuZGluZwogICAgICAgICAgICAgICAgZWNobyAic291cmNlLWZpbGUgL3Vzci9zaGFyZS9ieW9idS9wcm9maWxlcy90bXV4IiA+IH4vLnRtdXguY29uZgogICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICMgT3RoZXJ3aXNlLCB1c2UgdGhlIGxlZ2FjeSBqdWp1L3RtdXggY29uZmlndXJhdGlvbgogICAgICAgICAgICAgICAgY2F0ID4gfi8udG11eC5jb25mIDw8RU5ECiAgICAgICAgICAgICAgICAKIyBTdGF0dXMgYmFyCnNldC1vcHRpb24gLWcgc3RhdHVzLWJnIGJsYWNrCnNldC1vcHRpb24gLWcgc3RhdHVzLWZnIHdoaXRlCgpzZXQtd2luZG93LW9wdGlvbiAtZyB3aW5kb3ctc3RhdHVzLWN1cnJlbnQtYmcgcmVkCnNldC13aW5kb3ctb3B0aW9uIC1nIHdpbmRvdy1zdGF0dXMtY3VycmVudC1hdHRyIGJyaWdodAoKc2V0LW9wdGlvbiAtZyBzdGF0dXMtcmlnaHQgJycKCiMgUGFuZXMKc2V0LW9wdGlvbiAtZyBwYW5lLWJvcmRlci1mZyB3aGl0ZQpzZXQtb3B0aW9uIC1nIHBhbmUtYWN0aXZlLWJvcmRlci1mZyB3aGl0ZQoKIyBNb25pdG9yIGFjdGl2aXR5IG9uIHdpbmRvd3MKc2V0LXdpbmRvdy1vcHRpb24gLWcgbW9uaXRvci1hY3Rpdml0eSBvbgoKIyBTY3JlZW4gYmluZGluZ3MsIHNpbmNlIHBlb3BsZSBhcmUgbW9yZSBmYW1pbGlhciB3aXRoIHRoYXQuCnNldC1vcHRpb24gLWcgcHJlZml4IEMtYQpiaW5kIEMtYSBsYXN0LXdpbmRvdwpiaW5kIGEgc2VuZC1rZXkgQy1hCgpiaW5kIHwgc3BsaXQtd2luZG93IC1oCmJpbmQgLSBzcGxpdC13aW5kb3cgLXYKCiMgRml4IENUUkwtUEdVUC9QR0RPV04gZm9yIHZpbQpzZXQtd2luZG93LW9wdGlvbiAtZyB4dGVybS1rZXlzIG9uCgojIFByZXZlbnQgRVNDIGtleSBmcm9tIGFkZGluZyBkZWxheSBhbmQgYnJlYWtpbmcgVmltJ3MgRVNDID4gYXJyb3cga2V5CnNldC1vcHRpb24gLXMgZXNjYXBlLXRpbWUgMAoKRU5ECiAgICAgICAgZmkKZmkKCigKICAgICMgQ2xvc2UgdGhlIGluaGVyaXRlZCBsb2NrIEZELCBvciB0bXV4IHdpbGwga2VlcCBpdCBvcGVuLgogICAgZXhlYyA5PiYtCiAgICBleGVjIHRtdXggbmV3LXNlc3Npb24gLXMgbXlzcWwvMAopCikgOT4vdG1wL2p1anUtdW5pdC1teXNxbC0wLWRlYnVnLWhvb2tzLWV4aXQKKSA4Pi90bXAvanVqdS11bml0LW15c3FsLTAtZGVidWctaG9va3MKZXhpdCAkPwo= | base64 -d > $F; . $F'\n"),
32
	result: regexp.QuoteMeta(debugHooksArgs + "ubuntu@dummyenv-0.dns -- sudo /bin/bash -c 'F=$(mktemp); echo IyEvYmluL2Jhc2gKKAojIExvY2sgdGhlIGp1anUtPHVuaXQ+LWRlYnVnIGxvY2tmaWxlLgpmbG9jayAtbiA4IHx8IChlY2hvICJGYWlsZWQgdG8gYWNxdWlyZSAvdG1wL2p1anUtdW5pdC1teXNxbC0wLWRlYnVnLWhvb2tzOiB1bml0IGlzIGFscmVhZHkgYmVpbmcgZGVidWdnZWQiIDI+JjE7IGV4aXQgMSkKKAojIENsb3NlIHRoZSBpbmhlcml0ZWQgbG9jayBGRCwgb3IgdG11eCB3aWxsIGtlZXAgaXQgb3Blbi4KZXhlYyA4PiYtCgojIFdyaXRlIG91dCB0aGUgZGVidWctaG9va3MgYXJncy4KZWNobyAiZTMwSyIgfCBiYXNlNjQgLWQgPiAvdG1wL2p1anUtdW5pdC1teXNxbC0wLWRlYnVnLWhvb2tzCgojIExvY2sgdGhlIGp1anUtPHVuaXQ+LWRlYnVnLWV4aXQgbG9ja2ZpbGUuCmZsb2NrIC1uIDkgfHwgZXhpdCAxCgojIFdhaXQgZm9yIHRtdXggdG8gYmUgaW5zdGFsbGVkLgp3aGlsZSBbICEgLWYgL3Vzci9iaW4vdG11eCBdOyBkbwogICAgc2xlZXAgMQpkb25lCgppZiBbICEgLWYgfi8udG11eC5jb25mIF07IHRoZW4KICAgICAgICBpZiBbIC1mIC91c3Ivc2hhcmUvYnlvYnUvcHJvZmlsZXMvdG11eCBdOyB0aGVuCiAgICAgICAgICAgICAgICAjIFVzZSBieW9idS90bXV4IHByb2ZpbGUgZm9yIGZhbWlsaWFyIGtleWJpbmRpbmdzIGFuZCBicmFuZGluZwogICAgICAgICAgICAgICAgZWNobyAic291cmNlLWZpbGUgL3Vzci9zaGFyZS9ieW9idS9wcm9maWxlcy90bXV4IiA+IH4vLnRtdXguY29uZgogICAgICAgIGVsc2UKICAgICAgICAgICAgICAgICMgT3RoZXJ3aXNlLCB1c2UgdGhlIGxlZ2FjeSBqdWp1L3RtdXggY29uZmlndXJhdGlvbgogICAgICAgICAgICAgICAgY2F0ID4gfi8udG11eC5jb25mIDw8RU5ECiAgICAgICAgICAgICAgICAKIyBTdGF0dXMgYmFyCnNldC1vcHRpb24gLWcgc3RhdHVzLWJnIGJsYWNrCnNldC1vcHRpb24gLWcgc3RhdHVzLWZnIHdoaXRlCgpzZXQtd2luZG93LW9wdGlvbiAtZyB3aW5kb3ctc3RhdHVzLWN1cnJlbnQtYmcgcmVkCnNldC13aW5kb3ctb3B0aW9uIC1nIHdpbmRvdy1zdGF0dXMtY3VycmVudC1hdHRyIGJyaWdodAoKc2V0LW9wdGlvbiAtZyBzdGF0dXMtcmlnaHQgJycKCiMgUGFuZXMKc2V0LW9wdGlvbiAtZyBwYW5lLWJvcmRlci1mZyB3aGl0ZQpzZXQtb3B0aW9uIC1nIHBhbmUtYWN0aXZlLWJvcmRlci1mZyB3aGl0ZQoKIyBNb25pdG9yIGFjdGl2aXR5IG9uIHdpbmRvd3MKc2V0LXdpbmRvdy1vcHRpb24gLWcgbW9uaXRvci1hY3Rpdml0eSBvbgoKIyBTY3JlZW4gYmluZGluZ3MsIHNpbmNlIHBlb3BsZSBhcmUgbW9yZSBmYW1pbGlhciB3aXRoIHRoYXQuCnNldC1vcHRpb24gLWcgcHJlZml4IEMtYQpiaW5kIEMtYSBsYXN0LXdpbmRvdwpiaW5kIGEgc2VuZC1rZXkgQy1hCgpiaW5kIHwgc3BsaXQtd2luZG93IC1oCmJpbmQgLSBzcGxpdC13aW5kb3cgLXYKCiMgRml4IENUUkwtUEdVUC9QR0RPV04gZm9yIHZpbQpzZXQtd2luZG93LW9wdGlvbiAtZyB4dGVybS1rZXlzIG9uCgojIFByZXZlbnQgRVNDIGtleSBmcm9tIGFkZGluZyBkZWxheSBhbmQgYnJlYWtpbmcgVmltJ3MgRVNDID4gYXJyb3cga2V5CnNldC1vcHRpb24gLXMgZXNjYXBlLXRpbWUgMAoKRU5ECiAgICAgICAgZmkKZmkKCigKICAgICMgQ2xvc2UgdGhlIGluaGVyaXRlZCBsb2NrIEZELCBvciB0bXV4IHdpbGwga2VlcCBpdCBvcGVuLgogICAgZXhlYyA5PiYtCiAgICBleGVjIHRtdXggbmV3LXNlc3Npb24gLXMgbXlzcWwvMAopCikgOT4vdG1wL2p1anUtdW5pdC1teXNxbC0wLWRlYnVnLWhvb2tzLWV4aXQKKSA4Pi90bXAvanVqdS11bml0LW15c3FsLTAtZGVidWctaG9va3MKZXhpdCAkPwo= | base64 -d > $F; . $F'\n"),
515
33
}, {
33
}, {
516
34
	args:   []string{"mongodb/1"},
34
	args:   []string{"mongodb/1"},
518
35
	result: regexp.QuoteMeta(debugHooksArgs + "dummyenv-2.dns -- sudo /bin/bash -c 'F=$(mktemp); echo IyEvYmluL2Jhc2gKKAojIExvY2sgdGhlIGp1anUtPHVuaXQ+LWRlYnVnIGxvY2tmaWxlLgpmbG9jayAtbiA4IHx8IChlY2hvICJGYWlsZWQgdG8gYWNxdWlyZSAvdG1wL2p1anUtdW5pdC1tb25nb2RiLTEtZGVidWctaG9va3M6IHVuaXQgaXMgYWxyZWFkeSBiZWluZyBkZWJ1Z2dlZCIgMj4mMTsgZXhpdCAxKQooCiMgQ2xvc2UgdGhlIGluaGVyaXRlZCBsb2NrIEZELCBvciB0bXV4IHdpbGwga2VlcCBpdCBvcGVuLgpleGVjIDg+Ji0KCiMgV3JpdGUgb3V0IHRoZSBkZWJ1Zy1ob29rcyBhcmdzLgplY2hvICJlMzBLIiB8IGJhc2U2NCAtZCA+IC90bXAvanVqdS11bml0LW1vbmdvZGItMS1kZWJ1Zy1ob29rcwoKIyBMb2NrIHRoZSBqdWp1LTx1bml0Pi1kZWJ1Zy1leGl0IGxvY2tmaWxlLgpmbG9jayAtbiA5IHx8IGV4aXQgMQoKIyBXYWl0IGZvciB0bXV4IHRvIGJlIGluc3RhbGxlZC4Kd2hpbGUgWyAhIC1mIC91c3IvYmluL3RtdXggXTsgZG8KICAgIHNsZWVwIDEKZG9uZQoKaWYgWyAhIC1mIH4vLnRtdXguY29uZiBdOyB0aGVuCiAgICAgICAgaWYgWyAtZiAvdXNyL3NoYXJlL2J5b2J1L3Byb2ZpbGVzL3RtdXggXTsgdGhlbgogICAgICAgICAgICAgICAgIyBVc2UgYnlvYnUvdG11eCBwcm9maWxlIGZvciBmYW1pbGlhciBrZXliaW5kaW5ncyBhbmQgYnJhbmRpbmcKICAgICAgICAgICAgICAgIGVjaG8gInNvdXJjZS1maWxlIC91c3Ivc2hhcmUvYnlvYnUvcHJvZmlsZXMvdG11eCIgPiB+Ly50bXV4LmNvbmYKICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAjIE90aGVyd2lzZSwgdXNlIHRoZSBsZWdhY3kganVqdS90bXV4IGNvbmZpZ3VyYXRpb24KICAgICAgICAgICAgICAgIGNhdCA+IH4vLnRtdXguY29uZiA8PEVORAogICAgICAgICAgICAgICAgCiMgU3RhdHVzIGJhcgpzZXQtb3B0aW9uIC1nIHN0YXR1cy1iZyBibGFjawpzZXQtb3B0aW9uIC1nIHN0YXR1cy1mZyB3aGl0ZQoKc2V0LXdpbmRvdy1vcHRpb24gLWcgd2luZG93LXN0YXR1cy1jdXJyZW50LWJnIHJlZApzZXQtd2luZG93LW9wdGlvbiAtZyB3aW5kb3ctc3RhdHVzLWN1cnJlbnQtYXR0ciBicmlnaHQKCnNldC1vcHRpb24gLWcgc3RhdHVzLXJpZ2h0ICcnCgojIFBhbmVzCnNldC1vcHRpb24gLWcgcGFuZS1ib3JkZXItZmcgd2hpdGUKc2V0LW9wdGlvbiAtZyBwYW5lLWFjdGl2ZS1ib3JkZXItZmcgd2hpdGUKCiMgTW9uaXRvciBhY3Rpdml0eSBvbiB3aW5kb3dzCnNldC13aW5kb3ctb3B0aW9uIC1nIG1vbml0b3ItYWN0aXZpdHkgb24KCiMgU2NyZWVuIGJpbmRpbmdzLCBzaW5jZSBwZW9wbGUgYXJlIG1vcmUgZmFtaWxpYXIgd2l0aCB0aGF0LgpzZXQtb3B0aW9uIC1nIHByZWZpeCBDLWEKYmluZCBDLWEgbGFzdC13aW5kb3cKYmluZCBhIHNlbmQta2V5IEMtYQoKYmluZCB8IHNwbGl0LXdpbmRvdyAtaApiaW5kIC0gc3BsaXQtd2luZG93IC12CgojIEZpeCBDVFJMLVBHVVAvUEdET1dOIGZvciB2aW0Kc2V0LXdpbmRvdy1vcHRpb24gLWcgeHRlcm0ta2V5cyBvbgoKIyBQcmV2ZW50IEVTQyBrZXkgZnJvbSBhZGRpbmcgZGVsYXkgYW5kIGJyZWFraW5nIFZpbSdzIEVTQyA+IGFycm93IGtleQpzZXQtb3B0aW9uIC1zIGVzY2FwZS10aW1lIDAKCkVORAogICAgICAgIGZpCmZpCgooCiAgICAjIENsb3NlIHRoZSBpbmhlcml0ZWQgbG9jayBGRCwgb3IgdG11eCB3aWxsIGtlZXAgaXQgb3Blbi4KICAgIGV4ZWMgOT4mLQogICAgZXhlYyB0bXV4IG5ldy1zZXNzaW9uIC1zIG1vbmdvZGIvMQopCikgOT4vdG1wL2p1anUtdW5pdC1tb25nb2RiLTEtZGVidWctaG9va3MtZXhpdAopIDg+L3RtcC9qdWp1LXVuaXQtbW9uZ29kYi0xLWRlYnVnLWhvb2tzCmV4aXQgJD8K | base64 -d > $F; . $F'\n"),
35
	result: regexp.QuoteMeta(debugHooksArgs + "ubuntu@dummyenv-2.dns -- sudo /bin/bash -c 'F=$(mktemp); echo IyEvYmluL2Jhc2gKKAojIExvY2sgdGhlIGp1anUtPHVuaXQ+LWRlYnVnIGxvY2tmaWxlLgpmbG9jayAtbiA4IHx8IChlY2hvICJGYWlsZWQgdG8gYWNxdWlyZSAvdG1wL2p1anUtdW5pdC1tb25nb2RiLTEtZGVidWctaG9va3M6IHVuaXQgaXMgYWxyZWFkeSBiZWluZyBkZWJ1Z2dlZCIgMj4mMTsgZXhpdCAxKQooCiMgQ2xvc2UgdGhlIGluaGVyaXRlZCBsb2NrIEZELCBvciB0bXV4IHdpbGwga2VlcCBpdCBvcGVuLgpleGVjIDg+Ji0KCiMgV3JpdGUgb3V0IHRoZSBkZWJ1Zy1ob29rcyBhcmdzLgplY2hvICJlMzBLIiB8IGJhc2U2NCAtZCA+IC90bXAvanVqdS11bml0LW1vbmdvZGItMS1kZWJ1Zy1ob29rcwoKIyBMb2NrIHRoZSBqdWp1LTx1bml0Pi1kZWJ1Zy1leGl0IGxvY2tmaWxlLgpmbG9jayAtbiA5IHx8IGV4aXQgMQoKIyBXYWl0IGZvciB0bXV4IHRvIGJlIGluc3RhbGxlZC4Kd2hpbGUgWyAhIC1mIC91c3IvYmluL3RtdXggXTsgZG8KICAgIHNsZWVwIDEKZG9uZQoKaWYgWyAhIC1mIH4vLnRtdXguY29uZiBdOyB0aGVuCiAgICAgICAgaWYgWyAtZiAvdXNyL3NoYXJlL2J5b2J1L3Byb2ZpbGVzL3RtdXggXTsgdGhlbgogICAgICAgICAgICAgICAgIyBVc2UgYnlvYnUvdG11eCBwcm9maWxlIGZvciBmYW1pbGlhciBrZXliaW5kaW5ncyBhbmQgYnJhbmRpbmcKICAgICAgICAgICAgICAgIGVjaG8gInNvdXJjZS1maWxlIC91c3Ivc2hhcmUvYnlvYnUvcHJvZmlsZXMvdG11eCIgPiB+Ly50bXV4LmNvbmYKICAgICAgICBlbHNlCiAgICAgICAgICAgICAgICAjIE90aGVyd2lzZSwgdXNlIHRoZSBsZWdhY3kganVqdS90bXV4IGNvbmZpZ3VyYXRpb24KICAgICAgICAgICAgICAgIGNhdCA+IH4vLnRtdXguY29uZiA8PEVORAogICAgICAgICAgICAgICAgCiMgU3RhdHVzIGJhcgpzZXQtb3B0aW9uIC1nIHN0YXR1cy1iZyBibGFjawpzZXQtb3B0aW9uIC1nIHN0YXR1cy1mZyB3aGl0ZQoKc2V0LXdpbmRvdy1vcHRpb24gLWcgd2luZG93LXN0YXR1cy1jdXJyZW50LWJnIHJlZApzZXQtd2luZG93LW9wdGlvbiAtZyB3aW5kb3ctc3RhdHVzLWN1cnJlbnQtYXR0ciBicmlnaHQKCnNldC1vcHRpb24gLWcgc3RhdHVzLXJpZ2h0ICcnCgojIFBhbmVzCnNldC1vcHRpb24gLWcgcGFuZS1ib3JkZXItZmcgd2hpdGUKc2V0LW9wdGlvbiAtZyBwYW5lLWFjdGl2ZS1ib3JkZXItZmcgd2hpdGUKCiMgTW9uaXRvciBhY3Rpdml0eSBvbiB3aW5kb3dzCnNldC13aW5kb3ctb3B0aW9uIC1nIG1vbml0b3ItYWN0aXZpdHkgb24KCiMgU2NyZWVuIGJpbmRpbmdzLCBzaW5jZSBwZW9wbGUgYXJlIG1vcmUgZmFtaWxpYXIgd2l0aCB0aGF0LgpzZXQtb3B0aW9uIC1nIHByZWZpeCBDLWEKYmluZCBDLWEgbGFzdC13aW5kb3cKYmluZCBhIHNlbmQta2V5IEMtYQoKYmluZCB8IHNwbGl0LXdpbmRvdyAtaApiaW5kIC0gc3BsaXQtd2luZG93IC12CgojIEZpeCBDVFJMLVBHVVAvUEdET1dOIGZvciB2aW0Kc2V0LXdpbmRvdy1vcHRpb24gLWcgeHRlcm0ta2V5cyBvbgoKIyBQcmV2ZW50IEVTQyBrZXkgZnJvbSBhZGRpbmcgZGVsYXkgYW5kIGJyZWFraW5nIFZpbSdzIEVTQyA+IGFycm93IGtleQpzZXQtb3B0aW9uIC1zIGVzY2FwZS10aW1lIDAKCkVORAogICAgICAgIGZpCmZpCgooCiAgICAjIENsb3NlIHRoZSBpbmhlcml0ZWQgbG9jayBGRCwgb3IgdG11eCB3aWxsIGtlZXAgaXQgb3Blbi4KICAgIGV4ZWMgOT4mLQogICAgZXhlYyB0bXV4IG5ldy1zZXNzaW9uIC1zIG1vbmdvZGIvMQopCikgOT4vdG1wL2p1anUtdW5pdC1tb25nb2RiLTEtZGVidWctaG9va3MtZXhpdAopIDg+L3RtcC9qdWp1LXVuaXQtbW9uZ29kYi0xLWRlYnVnLWhvb2tzCmV4aXQgJD8K | base64 -d > $F; . $F'\n"),
519
36
}, {
36
}, {
520
37
	info:   `"*" is a valid hook name: it means hook everything`,
37
	info:   `"*" is a valid hook name: it means hook everything`,
521
38
	args:   []string{"mysql/0", "*"},
38
	args:   []string{"mysql/0", "*"},
522
39
39
523
=== modified file 'cmd/juju/scp.go'
524
--- cmd/juju/scp.go	2013-11-20 13:29:15 +0000
525
+++ cmd/juju/scp.go	2013-12-03 06:15:09 +0000
526
@@ -5,10 +5,10 @@
527
5
5
528
6
import (
6
import (
529
7
	"errors"
7
	"errors"
530
8
	"os/exec"
531
9
	"strings"
8
	"strings"
532
10
9
533
11
	"launchpad.net/juju-core/cmd"
10
	"launchpad.net/juju-core/cmd"
534
11
	"launchpad.net/juju-core/utils/ssh"
535
12
)
12
)
536
13
13
537
14
// SCPCommand is responsible for launching a scp command to copy files to/from remote machine(s)
14
// SCPCommand is responsible for launching a scp command to copy files to/from remote machine(s)
538
@@ -80,9 +80,7 @@
539
80
		}
80
		}
540
81
	}
81
	}
541
82
82
545
83
	args := []string{"-o", "StrictHostKeyChecking no", "-o", "PasswordAuthentication no"}
83
	cmd := ssh.ScpCommand(c.Args[0], c.Args[1], ssh.NoPasswordAuthentication)
543
84
	args = append(args, c.Args...)
544
85
	cmd := exec.Command("scp", args...)
546
86
	cmd.Stdin = ctx.Stdin
84
	cmd.Stdin = ctx.Stdin
547
87
	cmd.Stdout = ctx.Stdout
85
	cmd.Stdout = ctx.Stdout
548
88
	cmd.Stderr = ctx.Stderr
86
	cmd.Stderr = ctx.Stderr
549
89
87
550
=== modified file 'cmd/juju/scp_test.go'
551
--- cmd/juju/scp_test.go	2013-11-08 04:45:20 +0000
552
+++ cmd/juju/scp_test.go	2013-12-03 06:15:09 +0000
553
@@ -39,7 +39,7 @@
554
39
	},
39
	},
555
40
	{
40
	{
556
41
		[]string{"a", "b", "mysql/0"},
41
		[]string{"a", "b", "mysql/0"},
558
42
		commonArgs + "a b mysql/0\n",
42
		commonArgs + "a b\n",
559
43
	},
43
	},
560
44
	{
44
	{
561
45
		[]string{"mongodb/1:foo", "mongodb/0:"},
45
		[]string{"mongodb/1:foo", "mongodb/0:"},
562
46
46
563
=== modified file 'cmd/juju/ssh.go'
564
--- cmd/juju/ssh.go	2013-11-27 12:02:11 +0000
565
+++ cmd/juju/ssh.go	2013-12-03 06:15:09 +0000
566
@@ -6,7 +6,6 @@
567
6
import (
6
import (
568
7
	"errors"
7
	"errors"
569
8
	"fmt"
8
	"fmt"
570
9
	"os/exec"
571
10
	"time"
9
	"time"
572
11
10
573
12
	"launchpad.net/juju-core/cmd"
11
	"launchpad.net/juju-core/cmd"
574
@@ -16,6 +15,7 @@
575
16
	"launchpad.net/juju-core/rpc"
15
	"launchpad.net/juju-core/rpc"
576
17
	"launchpad.net/juju-core/state/api"
16
	"launchpad.net/juju-core/state/api"
577
18
	"launchpad.net/juju-core/utils"
17
	"launchpad.net/juju-core/utils"
578
18
	"launchpad.net/juju-core/utils/ssh"
579
19
)
19
)
580
20
20
581
21
// SSHCommand is responsible for launching a ssh shell on a given unit or machine.
21
// SSHCommand is responsible for launching a ssh shell on a given unit or machine.
582
@@ -82,9 +82,13 @@
583
82
	if err != nil {
82
	if err != nil {
584
83
		return err
83
		return err
585
84
	}
84
	}
589
85
	args := []string{"-l", "ubuntu", "-t", "-o", "StrictHostKeyChecking no", "-o", "PasswordAuthentication no", host}
85
	args := c.Args
590
86
	args = append(args, c.Args...)
86
	if len(args) > 0 && args[0] == "--" {
591
87
	cmd := exec.Command("ssh", args...)
87
		// utils/ssh adds "--"; we will continue to accept
592
88
		// it from the CLI for backwards compatibility.
593
89
		args = args[1:]
594
90
	}
595
91
	cmd := ssh.Command("ubuntu@"+host, args, ssh.NoPasswordAuthentication, ssh.AllocateTTY)
596
88
	cmd.Stdin = ctx.Stdin
92
	cmd.Stdin = ctx.Stdin
597
89
	cmd.Stdout = ctx.Stdout
93
	cmd.Stdout = ctx.Stdout
598
90
	cmd.Stderr = ctx.Stderr
94
	cmd.Stderr = ctx.Stderr
599
91
95
600
=== modified file 'cmd/juju/ssh_test.go'
601
--- cmd/juju/ssh_test.go	2013-11-08 04:45:20 +0000
602
+++ cmd/juju/ssh_test.go	2013-12-03 06:15:09 +0000
603
@@ -60,7 +60,7 @@
604
60
60
605
61
const (
61
const (
606
62
	commonArgs = `-o StrictHostKeyChecking no -o PasswordAuthentication no `
62
	commonArgs = `-o StrictHostKeyChecking no -o PasswordAuthentication no `
608
63
	sshArgs    = `-l ubuntu -t ` + commonArgs
63
	sshArgs    = commonArgs + `-t `
609
64
)
64
)
610
65
65
611
66
var sshTests = []struct {
66
var sshTests = []struct {
612
@@ -69,30 +69,30 @@
613
69
}{
69
}{
614
70
	{
70
	{
615
71
		[]string{"ssh", "0"},
71
		[]string{"ssh", "0"},
617
72
		sshArgs + "dummyenv-0.dns\n",
72
		sshArgs + "ubuntu@dummyenv-0.dns\n",
618
73
	},
73
	},
619
74
	// juju ssh 0 'uname -a'
74
	// juju ssh 0 'uname -a'
620
75
	{
75
	{
621
76
		[]string{"ssh", "0", "uname -a"},
76
		[]string{"ssh", "0", "uname -a"},
623
77
		sshArgs + "dummyenv-0.dns uname -a\n",
77
		sshArgs + "ubuntu@dummyenv-0.dns -- uname -a\n",
624
78
	},
78
	},
625
79
	// juju ssh 0 -- uname -a
79
	// juju ssh 0 -- uname -a
626
80
	{
80
	{
627
81
		[]string{"ssh", "0", "--", "uname", "-a"},
81
		[]string{"ssh", "0", "--", "uname", "-a"},
629
82
		sshArgs + "dummyenv-0.dns -- uname -a\n",
82
		sshArgs + "ubuntu@dummyenv-0.dns -- uname -a\n",
630
83
	},
83
	},
631
84
	// juju ssh 0 uname -a
84
	// juju ssh 0 uname -a
632
85
	{
85
	{
633
86
		[]string{"ssh", "0", "uname", "-a"},
86
		[]string{"ssh", "0", "uname", "-a"},
635
87
		sshArgs + "dummyenv-0.dns uname -a\n",
87
		sshArgs + "ubuntu@dummyenv-0.dns -- uname -a\n",
636
88
	},
88
	},
637
89
	{
89
	{
638
90
		[]string{"ssh", "mysql/0"},
90
		[]string{"ssh", "mysql/0"},
640
91
		sshArgs + "dummyenv-0.dns\n",
91
		sshArgs + "ubuntu@dummyenv-0.dns\n",
641
92
	},
92
	},
642
93
	{
93
	{
643
94
		[]string{"ssh", "mongodb/1"},
94
		[]string{"ssh", "mongodb/1"},
645
95
		sshArgs + "dummyenv-2.dns\n",
95
		sshArgs + "ubuntu@dummyenv-2.dns\n",
646
96
	},
96
	},
647
97
}
97
}
648
98
98
649
99
99
650
=== modified file 'environs/bootstrap/state.go'
651
--- environs/bootstrap/state.go	2013-11-18 04:53:44 +0000
652
+++ environs/bootstrap/state.go	2013-12-03 06:15:09 +0000
653
@@ -52,6 +52,11 @@
654
52
	return storage.URL(StateFile)
52
	return storage.URL(StateFile)
655
53
}
53
}
656
54
54
657
55
// DeleteStateFile deletes the state file on the given storage.
658
56
func DeleteStateFile(storage storage.Storage) error {
659
57
	return storage.Remove(StateFile)
660
58
}
661
59
662
55
// SaveState writes the given state to the given storage.
60
// SaveState writes the given state to the given storage.
663
56
func SaveState(storage storage.StorageWriter, state *BootstrapState) error {
61
func SaveState(storage storage.StorageWriter, state *BootstrapState) error {
664
57
	data, err := goyaml.Marshal(state)
62
	data, err := goyaml.Marshal(state)
665
58
63
666
=== modified file 'environs/bootstrap/state_test.go'
667
--- environs/bootstrap/state_test.go	2013-11-18 04:53:44 +0000
668
+++ environs/bootstrap/state_test.go	2013-12-03 06:15:09 +0000
669
@@ -6,6 +6,8 @@
670
6
import (
6
import (
671
7
	"bytes"
7
	"bytes"
672
8
	"io/ioutil"
8
	"io/ioutil"
673
9
	"os"
674
10
	"path/filepath"
675
9
11
676
10
	gc "launchpad.net/gocheck"
12
	gc "launchpad.net/gocheck"
677
11
	"launchpad.net/goyaml"
13
	"launchpad.net/goyaml"
678
@@ -15,6 +17,7 @@
679
15
	"launchpad.net/juju-core/environs/storage"
17
	"launchpad.net/juju-core/environs/storage"
680
16
	envtesting "launchpad.net/juju-core/environs/testing"
18
	envtesting "launchpad.net/juju-core/environs/testing"
681
17
	"launchpad.net/juju-core/instance"
19
	"launchpad.net/juju-core/instance"
682
20
	jc "launchpad.net/juju-core/testing/checkers"
683
18
	"launchpad.net/juju-core/testing/testbase"
21
	"launchpad.net/juju-core/testing/testbase"
684
19
)
22
)
685
20
23
686
@@ -48,6 +51,24 @@
687
48
	c.Check(url, gc.Equals, expectedURL)
51
	c.Check(url, gc.Equals, expectedURL)
688
49
}
52
}
689
50
53
690
54
func (suite *StateSuite) TestDeleteStateFile(c *gc.C) {
691
55
	closer, stor, dataDir := envtesting.CreateLocalTestStorage(c)
692
56
	defer closer.Close()
693
57
694
58
	err := bootstrap.DeleteStateFile(stor)
695
59
	c.Assert(err, gc.IsNil) // doesn't exist, juju don't care
696
60
697
61
	_, err = bootstrap.CreateStateFile(stor)
698
62
	c.Assert(err, gc.IsNil)
699
63
	_, err = os.Stat(filepath.Join(dataDir, bootstrap.StateFile))
700
64
	c.Assert(err, gc.IsNil)
701
65
702
66
	err = bootstrap.DeleteStateFile(stor)
703
67
	c.Assert(err, gc.IsNil)
704
68
	_, err = os.Stat(filepath.Join(dataDir, bootstrap.StateFile))
705
69
	c.Assert(err, jc.Satisfies, os.IsNotExist)
706
70
}
707
71
708
51
func (suite *StateSuite) TestSaveStateWritesStateFile(c *gc.C) {
72
func (suite *StateSuite) TestSaveStateWritesStateFile(c *gc.C) {
709
52
	stor := suite.newStorage(c)
73
	stor := suite.newStorage(c)
710
53
	arch := "amd64"
74
	arch := "amd64"
711
54
75
712
=== modified file 'environs/cloudinit.go'
713
--- environs/cloudinit.go	2013-11-26 12:24:48 +0000
714
+++ environs/cloudinit.go	2013-12-03 06:15:09 +0000
715
@@ -133,9 +133,16 @@
716
133
	for _, script := range additionalScripts {
133
	for _, script := range additionalScripts {
717
134
		cloudcfg.AddRunCmd(script)
134
		cloudcfg.AddRunCmd(script)
718
135
	}
135
	}
722
136
	err := cloudinit.Configure(cfg, cloudcfg)
136
	// When bootstrapping, we only want to apt-get update/upgrade
723
137
	if err != nil {
137
	// and setup the SSH keys. The rest we leave to cloudinit/sshinit.
724
138
		return nil, err
138
	if cfg.StateServer {
725
139
		if err := cloudinit.ConfigureBasic(cfg, cloudcfg); err != nil {
726
140
			return nil, err
727
141
		}
728
142
	} else {
729
143
		if err := cloudinit.Configure(cfg, cloudcfg); err != nil {
730
144
			return nil, err
731
145
		}
732
139
	}
146
	}
733
140
	data, err := cloudcfg.Render()
147
	data, err := cloudcfg.Render()
734
141
	logger.Tracef("Generated cloud init:\n%s", string(data))
148
	logger.Tracef("Generated cloud init:\n%s", string(data))
735
142
149
736
=== modified file 'environs/cloudinit/cloudinit.go'
737
--- environs/cloudinit/cloudinit.go	2013-11-26 12:24:48 +0000
738
+++ environs/cloudinit/cloudinit.go	2013-12-03 06:15:09 +0000
739
@@ -132,16 +132,60 @@
740
132
// Configure updates the provided cloudinit.Config with
132
// Configure updates the provided cloudinit.Config with
741
133
// configuration to initialize a Juju machine agent.
133
// configuration to initialize a Juju machine agent.
742
134
func Configure(cfg *MachineConfig, c *cloudinit.Config) error {
134
func Configure(cfg *MachineConfig, c *cloudinit.Config) error {
743
135
	if err := ConfigureBasic(cfg, c); err != nil {
744
136
		return err
745
137
	}
746
138
	return ConfigureJuju(cfg, c)
747
139
}
748
140
749
141
const cloudInitOutputLog = "/var/log/cloud-init-output.log"
750
142
751
143
// ConfigureBasic updates the provided cloudinit.Config with
752
144
// basic configuration to initialise an OS image, such that it can
753
145
// be connected to via SSH, and log to a standard location.
754
146
//
755
147
// Any potentially failing operation should not be added to the
756
148
// configuration, but should instead be done in ConfigureJuju.
757
149
//
758
150
// Note: we don't do apt update/upgrade here so as not to have to wait on
759
151
// apt to finish when performing the second half of image initialisation.
760
152
// Doing it later brings the benefit of feedback in the face of errors,
761
153
// but adds to the running time of initialisation due to lack of activity
762
154
// between image bringup and start of agent installation.
763
155
func ConfigureBasic(cfg *MachineConfig, c *cloudinit.Config) error {
764
156
	c.AddSSHAuthorizedKeys(cfg.AuthorizedKeys)
765
157
	c.SetOutput(cloudinit.OutAll, "| tee -a "+cloudInitOutputLog, "")
766
158
	return nil
767
159
}
768
160
769
161
// ConfigureJuju updates the provided cloudinit.Config with configuration
770
162
// to initialise a Juju machine agent.
771
163
func ConfigureJuju(cfg *MachineConfig, c *cloudinit.Config) error {
772
135
	if err := verifyConfig(cfg); err != nil {
164
	if err := verifyConfig(cfg); err != nil {
773
136
		return err
165
		return err
774
137
	}
166
	}
775
138
167
777
139
	// General options.
168
	// Initialise progress reporting. We need to do separately for runcmd
778
169
	// and (possibly, below) for bootcmd, as they may be run in different
779
170
	// shell sessions.
780
171
	initProgressCmd := cloudinit.InitProgressCmd()
781
172
	c.AddRunCmd(initProgressCmd)
782
173
783
174
	// If we're doing synchronous bootstrap or manual provisioning, then
784
175
	// ConfigureBasic won't have been invoked; thus, the output log won't
785
176
	// have been set. We don't want to show the log to the user, so simply
786
177
	// append to the log file rather than teeing.
787
178
	if stdout, _ := c.Output(cloudinit.OutAll); stdout == "" {
788
179
		c.SetOutput(cloudinit.OutAll, ">> "+cloudInitOutputLog, "")
789
180
		c.AddBootCmd(initProgressCmd)
790
181
		c.AddBootCmd(cloudinit.LogProgressCmd("Logging to %s on remote host", cloudInitOutputLog))
791
182
	}
792
183
793
184
	// Bring packages up-to-date.
794
185
	c.SetAptUpdate(true)
795
140
	c.SetAptUpgrade(true)
186
	c.SetAptUpgrade(true)
796
141
	c.SetAptUpdate(true)
797
142
	c.SetOutput(cloudinit.OutAll, "| tee -a /var/log/cloud-init-output.log", "")
798
143
	c.AddSSHAuthorizedKeys(cfg.AuthorizedKeys)
799
144
187
800
188
	// juju requires git for managing charm directories.
801
145
	c.AddPackage("git")
189
	c.AddPackage("git")
802
146
190
803
147
	c.AddScripts(
191
	c.AddScripts(
804
@@ -149,17 +193,18 @@
805
149
		fmt.Sprintf("mkdir -p %s", cfg.DataDir),
193
		fmt.Sprintf("mkdir -p %s", cfg.DataDir),
806
150
		"mkdir -p /var/log/juju")
194
		"mkdir -p /var/log/juju")
807
151
195
808
152
	wgetCommand := "wget"
809
153
	if cfg.DisableSSLHostnameVerification {
810
154
		wgetCommand = "wget --no-check-certificate"
811
155
	}
812
156
	// Make a directory for the tools to live in, then fetch the
196
	// Make a directory for the tools to live in, then fetch the
813
157
	// tools and unarchive them into it.
197
	// tools and unarchive them into it.
814
158
	var copyCmd string
198
	var copyCmd string
815
159
	if strings.HasPrefix(cfg.Tools.URL, fileSchemePrefix) {
199
	if strings.HasPrefix(cfg.Tools.URL, fileSchemePrefix) {
816
160
		copyCmd = fmt.Sprintf("cp %s $bin/tools.tar.gz", shquote(cfg.Tools.URL[len(fileSchemePrefix):]))
200
		copyCmd = fmt.Sprintf("cp %s $bin/tools.tar.gz", shquote(cfg.Tools.URL[len(fileSchemePrefix):]))
817
161
	} else {
201
	} else {
818
202
		wgetCommand := "wget"
819
203
		if cfg.DisableSSLHostnameVerification {
820
204
			wgetCommand = "wget --no-check-certificate"
821
205
		}
822
162
		copyCmd = fmt.Sprintf("%s --no-verbose -O $bin/tools.tar.gz %s", wgetCommand, shquote(cfg.Tools.URL))
206
		copyCmd = fmt.Sprintf("%s --no-verbose -O $bin/tools.tar.gz %s", wgetCommand, shquote(cfg.Tools.URL))
823
207
		c.AddRunCmd(cloudinit.LogProgressCmd("Fetching tools: %s", copyCmd))
824
163
	}
208
	}
825
164
	toolsJson, err := json.Marshal(cfg.Tools)
209
	toolsJson, err := json.Marshal(cfg.Tools)
826
165
	if err != nil {
210
	if err != nil {
827
@@ -231,6 +276,7 @@
828
231
		if cons != "" {
276
		if cons != "" {
829
232
			cons = " --constraints " + shquote(cons)
277
			cons = " --constraints " + shquote(cons)
830
233
		}
278
		}
831
279
		c.AddRunCmd(cloudinit.LogProgressCmd("Bootstrapping Juju machine agent"))
832
234
		c.AddScripts(
280
		c.AddScripts(
833
235
			fmt.Sprintf("echo %s > %s", shquote(cfg.StateInfoURL), BootstrapStateURLFile),
281
			fmt.Sprintf("echo %s > %s", shquote(cfg.StateInfoURL), BootstrapStateURLFile),
834
236
			// The bootstrapping is always run with debug on.
282
			// The bootstrapping is always run with debug on.
835
@@ -340,6 +386,7 @@
836
340
	if err != nil {
386
	if err != nil {
837
341
		return fmt.Errorf("cannot make cloud-init upstart script for the %s agent: %v", tag, err)
387
		return fmt.Errorf("cannot make cloud-init upstart script for the %s agent: %v", tag, err)
838
342
	}
388
	}
839
389
	c.AddRunCmd(cloudinit.LogProgressCmd("Starting Juju machine agent (%s)", name))
840
343
	c.AddScripts(cmds...)
390
	c.AddScripts(cmds...)
841
344
	return nil
391
	return nil
842
345
}
392
}
843
@@ -361,6 +408,7 @@
844
361
	if err != nil {
408
	if err != nil {
845
362
		return fmt.Errorf("cannot make cloud-init upstart script for the state database: %v", err)
409
		return fmt.Errorf("cannot make cloud-init upstart script for the state database: %v", err)
846
363
	}
410
	}
847
411
	c.AddRunCmd(cloudinit.LogProgressCmd("Starting MongoDB server (%s)", name))
848
364
	c.AddScripts(cmds...)
412
	c.AddScripts(cmds...)
849
365
	return nil
413
	return nil
850
366
}
414
}
851
367
415
852
=== modified file 'environs/cloudinit/cloudinit_test.go'
853
--- environs/cloudinit/cloudinit_test.go	2013-11-26 12:24:48 +0000
854
+++ environs/cloudinit/cloudinit_test.go	2013-12-03 06:15:09 +0000
855
@@ -88,9 +88,11 @@
856
88
		setEnvConfig: true,
88
		setEnvConfig: true,
857
89
		expectScripts: `
89
		expectScripts: `
858
90
echo ENABLE_MONGODB="no" > /etc/default/mongodb
90
echo ENABLE_MONGODB="no" > /etc/default/mongodb
859
91
test -e /proc/self/fd/9 \|\| exec 9>&2
860
91
set -xe
92
set -xe
861
92
mkdir -p /var/lib/juju
93
mkdir -p /var/lib/juju
862
93
mkdir -p /var/log/juju
94
mkdir -p /var/log/juju
863
95
echo 'Fetching tools.*
864
94
bin='/var/lib/juju/tools/1\.2\.3-precise-amd64'
96
bin='/var/lib/juju/tools/1\.2\.3-precise-amd64'
865
95
mkdir -p \$bin
97
mkdir -p \$bin
866
96
wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-precise-amd64\.tgz'
98
wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-precise-amd64\.tgz'
867
@@ -114,6 +116,7 @@
868
114
dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.0
116
dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.0
869
115
dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.1
117
dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.1
870
116
dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.2
118
dd bs=1M count=1 if=/dev/zero of=/var/lib/juju/db/journal/prealloc\.2
871
119
echo 'Starting MongoDB server \(juju-db\)'.*
872
117
cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
120
cat >> /etc/init/juju-db\.conf << 'EOF'\\ndescription "juju state database"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 65000 65000\\nlimit nproc 20000 20000\\n\\nexec /usr/bin/mongod --auth --dbpath=/var/lib/juju/db --sslOnNormalPorts --sslPEMKeyFile '/var/lib/juju/server\.pem' --sslPEMKeyPassword ignored --bind_ip 0\.0\.0\.0 --port 37017 --noprealloc --syslog --smallfiles\\nEOF\\n
873
118
start juju-db
121
start juju-db
874
119
mkdir -p '/var/lib/juju/agents/bootstrap'
122
mkdir -p '/var/lib/juju/agents/bootstrap'
875
@@ -121,10 +124,12 @@
876
121
printf '%s\\n' '.*' > '/var/lib/juju/agents/bootstrap/format'
124
printf '%s\\n' '.*' > '/var/lib/juju/agents/bootstrap/format'
877
122
install -m 600 /dev/null '/var/lib/juju/agents/bootstrap/agent\.conf'
125
install -m 600 /dev/null '/var/lib/juju/agents/bootstrap/agent\.conf'
878
123
printf '%s\\n' '.*' > '/var/lib/juju/agents/bootstrap/agent\.conf'
126
printf '%s\\n' '.*' > '/var/lib/juju/agents/bootstrap/agent\.conf'
879
127
echo 'Bootstrapping Juju machine agent'.*
880
124
echo 'some-url' > /tmp/provider-state-url
128
echo 'some-url' > /tmp/provider-state-url
881
125
/var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --constraints 'mem=2048M' --debug
129
/var/lib/juju/tools/1\.2\.3-precise-amd64/jujud bootstrap-state --data-dir '/var/lib/juju' --env-config '[^']*' --constraints 'mem=2048M' --debug
882
126
rm -rf '/var/lib/juju/agents/bootstrap'
130
rm -rf '/var/lib/juju/agents/bootstrap'
883
127
ln -s 1\.2\.3-precise-amd64 '/var/lib/juju/tools/machine-0'
131
ln -s 1\.2\.3-precise-amd64 '/var/lib/juju/tools/machine-0'
884
132
echo 'Starting Juju machine agent \(jujud-machine-0\)'.*
885
128
cat >> /etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --data-dir '/var/lib/juju' --machine-id 0 --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
133
cat >> /etc/init/jujud-machine-0\.conf << 'EOF'\\ndescription "juju machine-0 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-0/jujud machine --data-dir '/var/lib/juju' --machine-id 0 --debug >> /var/log/juju/machine-0\.log 2>&1\\nEOF\\n
886
129
start jujud-machine-0
134
start jujud-machine-0
887
130
`,
135
`,
888
@@ -193,9 +198,11 @@
889
193
			SyslogPort: 514,
198
			SyslogPort: 514,
890
194
		},
199
		},
891
195
		expectScripts: `
200
		expectScripts: `
892
201
test -e /proc/self/fd/9 \|\| exec 9>&2
893
196
set -xe
202
set -xe
894
197
mkdir -p /var/lib/juju
203
mkdir -p /var/lib/juju
895
198
mkdir -p /var/log/juju
204
mkdir -p /var/log/juju
896
205
echo 'Fetching tools.*
897
199
bin='/var/lib/juju/tools/1\.2\.3-linux-amd64'
206
bin='/var/lib/juju/tools/1\.2\.3-linux-amd64'
898
200
mkdir -p \$bin
207
mkdir -p \$bin
899
201
wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-linux-amd64\.tgz'
208
wget --no-verbose -O \$bin/tools\.tar\.gz 'http://foo\.com/tools/releases/juju1\.2\.3-linux-amd64\.tgz'
900
@@ -213,6 +220,7 @@
901
213
install -m 600 /dev/null '/var/lib/juju/agents/machine-99/agent\.conf'
220
install -m 600 /dev/null '/var/lib/juju/agents/machine-99/agent\.conf'
902
214
printf '%s\\n' '.*' > '/var/lib/juju/agents/machine-99/agent\.conf'
221
printf '%s\\n' '.*' > '/var/lib/juju/agents/machine-99/agent\.conf'
903
215
ln -s 1\.2\.3-linux-amd64 '/var/lib/juju/tools/machine-99'
222
ln -s 1\.2\.3-linux-amd64 '/var/lib/juju/tools/machine-99'
904
223
echo 'Starting Juju machine agent \(jujud-machine-99\)'.*
905
216
cat >> /etc/init/jujud-machine-99\.conf << 'EOF'\\ndescription "juju machine-99 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-99/jujud machine --data-dir '/var/lib/juju' --machine-id 99 --debug >> /var/log/juju/machine-99\.log 2>&1\\nEOF\\n
224
cat >> /etc/init/jujud-machine-99\.conf << 'EOF'\\ndescription "juju machine-99 agent"\\nauthor "Juju Team <juju@lists\.ubuntu\.com>"\\nstart on runlevel \[2345\]\\nstop on runlevel \[!2345\]\\nrespawn\\nnormal exit 0\\n\\nlimit nofile 20000 20000\\n\\nexec /var/lib/juju/tools/machine-99/jujud machine --data-dir '/var/lib/juju' --machine-id 99 --debug >> /var/log/juju/machine-99\.log 2>&1\\nEOF\\n
906
217
start jujud-machine-99
225
start jujud-machine-99
907
218
`,
226
`,
908
219
227
909
=== modified file 'environs/cloudinit_test.go'
910
--- environs/cloudinit_test.go	2013-11-20 04:28:46 +0000
911
+++ environs/cloudinit_test.go	2013-12-03 06:15:09 +0000
912
@@ -139,7 +139,15 @@
913
139
	c.Assert(err, gc.NotNil)
139
	c.Assert(err, gc.NotNil)
914
140
}
140
}
915
141
141
917
142
func (*CloudInitSuite) TestUserData(c *gc.C) {
142
func (s *CloudInitSuite) TestUserData(c *gc.C) {
918
143
	s.testUserData(c, false)
919
144
}
920
145
921
146
func (s *CloudInitSuite) TestStateServerUserData(c *gc.C) {
922
147
	s.testUserData(c, true)
923
148
}
924
149
925
150
func (*CloudInitSuite) testUserData(c *gc.C, stateServer bool) {
926
143
	testJujuHome := c.MkDir()
151
	testJujuHome := c.MkDir()
927
144
	defer config.SetJujuHome(config.SetJujuHome(testJujuHome))
152
	defer config.SetJujuHome(config.SetJujuHome(testJujuHome))
928
145
	tools := &tools.Tools{
153
	tools := &tools.Tools{
929
@@ -156,20 +164,25 @@
930
156
		StateServerCert: []byte(testing.ServerCert),
164
		StateServerCert: []byte(testing.ServerCert),
931
157
		StateServerKey:  []byte(testing.ServerKey),
165
		StateServerKey:  []byte(testing.ServerKey),
932
158
		StateInfo: &state.Info{
166
		StateInfo: &state.Info{
933
167
			Addrs:    []string{"127.0.0.1:1234"},
934
159
			Password: "pw1",
168
			Password: "pw1",
935
160
			CACert:   []byte("CA CERT\n" + testing.CACert),
169
			CACert:   []byte("CA CERT\n" + testing.CACert),
936
170
			Tag:      "machine-10",
937
161
		},
171
		},
938
162
		APIInfo: &api.Info{
172
		APIInfo: &api.Info{
939
173
			Addrs:    []string{"127.0.0.1:1234"},
940
163
			Password: "pw2",
174
			Password: "pw2",
941
164
			CACert:   []byte("CA CERT\n" + testing.CACert),
175
			CACert:   []byte("CA CERT\n" + testing.CACert),
942
176
			Tag:      "machine-10",
943
165
		},
177
		},
944
166
		DataDir:          environs.DataDir,
178
		DataDir:          environs.DataDir,
945
167
		Config:           envConfig,
179
		Config:           envConfig,
946
168
		StatePort:        envConfig.StatePort(),
180
		StatePort:        envConfig.StatePort(),
947
169
		APIPort:          envConfig.APIPort(),
181
		APIPort:          envConfig.APIPort(),
948
170
		SyslogPort:       envConfig.SyslogPort(),
182
		SyslogPort:       envConfig.SyslogPort(),
950
171
		StateServer:      true,
183
		StateServer:      stateServer,
951
172
		AgentEnvironment: map[string]string{agent.ProviderType: "dummy"},
184
		AgentEnvironment: map[string]string{agent.ProviderType: "dummy"},
952
185
		AuthorizedKeys:   "wheredidileavemykeys",
953
173
	}
186
	}
954
174
	script1 := "script1"
187
	script1 := "script1"
955
175
	script2 := "script2"
188
	script2 := "script2"
956
@@ -184,11 +197,32 @@
957
184
	err = goyaml.Unmarshal(unzipped, &config)
197
	err = goyaml.Unmarshal(unzipped, &config)
958
185
	c.Assert(err, gc.IsNil)
198
	c.Assert(err, gc.IsNil)
959
186
199
960
187
	// Just check that the cloudinit config looks good.
961
188
	c.Check(config["apt_upgrade"], gc.Equals, true)
962
189
	// The scripts given to userData where added as the first
200
	// The scripts given to userData where added as the first
963
190
	// commands to be run.
201
	// commands to be run.
964
191
	runCmd := config["runcmd"].([]interface{})
202
	runCmd := config["runcmd"].([]interface{})
965
192
	c.Check(runCmd[0], gc.Equals, script1)
203
	c.Check(runCmd[0], gc.Equals, script1)
966
193
	c.Check(runCmd[1], gc.Equals, script2)
204
	c.Check(runCmd[1], gc.Equals, script2)
967
205
968
206
	if stateServer {
969
207
		// The cloudinit config should have nothing but the basics:
970
208
		// SSH authorized keys, the additional runcmds, and log output.
971
209
		//
972
210
		// Note: the additional runcmds *do* belong here, at least
973
211
		// for MAAS. MAAS needs to configure and then bounce the
974
212
		// network interfaces, which would sever the SSH connection
975
213
		// in the synchronous bootstrap phase.
976
214
		c.Check(config, gc.DeepEquals, map[interface{}]interface{}{
977
215
			"output": map[interface{}]interface{}{
978
216
				"all": "| tee -a /var/log/cloud-init-output.log",
979
217
			},
980
218
			"runcmd":              []interface{}{"script1", "script2"},
981
219
			"ssh_authorized_keys": []interface{}{"wheredidileavemykeys"},
982
220
		})
983
221
	} else {
984
222
		// Just check that the cloudinit config looks good,
985
223
		// and that there are more runcmds than the additional
986
224
		// ones we passed into ComposeUserData.
987
225
		c.Check(config["apt_upgrade"], gc.Equals, true)
988
226
		c.Check(len(runCmd) > 2, jc.IsTrue)
989
227
	}
990
194
}
228
}
991
195
229
992
=== modified file 'environs/manual/bootstrap.go'
993
--- environs/manual/bootstrap.go	2013-11-18 05:41:36 +0000
994
+++ environs/manual/bootstrap.go	2013-12-03 06:15:09 +0000
995
@@ -134,5 +134,5 @@
996
134
	for k, v := range agentEnv {
134
	for k, v := range agentEnv {
997
135
		mcfg.AgentEnvironment[k] = v
135
		mcfg.AgentEnvironment[k] = v
998
136
	}
136
	}
1000
137
	return ProvisionMachineAgent(args.Host, mcfg)
137
	return provisionMachineAgent(args.Host, mcfg)
1001
138
}
138
}
1002
139
139
1003
=== modified file 'environs/manual/detection.go'
1004
--- environs/manual/detection.go	2013-10-09 06:54:15 +0000
1005
+++ environs/manual/detection.go	2013-12-03 06:15:09 +0000
1006
@@ -12,6 +12,7 @@
1007
12
12
1008
13
	"launchpad.net/juju-core/instance"
13
	"launchpad.net/juju-core/instance"
1009
14
	"launchpad.net/juju-core/utils"
14
	"launchpad.net/juju-core/utils"
1010
15
	"launchpad.net/juju-core/utils/ssh"
1011
15
)
16
)
1012
16
17
1013
17
// checkProvisionedScript is the script to run on the remote machine
18
// checkProvisionedScript is the script to run on the remote machine
1014
@@ -25,7 +26,7 @@
1015
25
// exist on the host machine.
26
// exist on the host machine.
1016
26
func checkProvisioned(sshHost string) (bool, error) {
27
func checkProvisioned(sshHost string) (bool, error) {
1017
27
	logger.Infof("Checking if %s is already provisioned", sshHost)
28
	logger.Infof("Checking if %s is already provisioned", sshHost)
1019
28
	cmd := sshCommand(sshHost, fmt.Sprintf("bash -c %s", utils.ShQuote(checkProvisionedScript)))
29
	cmd := ssh.Command(sshHost, []string{"bash", "-c", utils.ShQuote(checkProvisionedScript)})
1020
29
	var stdout, stderr bytes.Buffer
30
	var stdout, stderr bytes.Buffer
1021
30
	cmd.Stdout = &stdout
31
	cmd.Stdout = &stdout
1022
31
	cmd.Stderr = &stderr
32
	cmd.Stderr = &stderr
1023
@@ -52,7 +53,7 @@
1024
52
// The sshHost argument must be a hostname of the form [user@]host.
53
// The sshHost argument must be a hostname of the form [user@]host.
1025
53
func DetectSeriesAndHardwareCharacteristics(sshHost string) (hc instance.HardwareCharacteristics, series string, err error) {
54
func DetectSeriesAndHardwareCharacteristics(sshHost string) (hc instance.HardwareCharacteristics, series string, err error) {
1026
54
	logger.Infof("Detecting series and characteristics on %s", sshHost)
55
	logger.Infof("Detecting series and characteristics on %s", sshHost)
1028
55
	cmd := sshCommand(sshHost, "bash")
56
	cmd := ssh.Command(sshHost, []string{"bash"})
1029
56
	cmd.Stdin = bytes.NewBufferString(detectionScript)
57
	cmd.Stdin = bytes.NewBufferString(detectionScript)
1030
57
	out, err := cmd.CombinedOutput()
58
	out, err := cmd.CombinedOutput()
1031
58
	if err != nil {
59
	if err != nil {
1032
59
60
1033
=== modified file 'environs/manual/provisioner.go'
1034
--- environs/manual/provisioner.go	2013-11-26 14:06:20 +0000
1035
+++ environs/manual/provisioner.go	2013-12-03 06:15:09 +0000
1036
@@ -11,6 +11,8 @@
1037
11
11
1038
12
	"launchpad.net/loggo"
12
	"launchpad.net/loggo"
1039
13
13
1040
14
	coreCloudinit "launchpad.net/juju-core/cloudinit"
1041
15
	"launchpad.net/juju-core/cloudinit/sshinit"
1042
14
	"launchpad.net/juju-core/constraints"
16
	"launchpad.net/juju-core/constraints"
1043
15
	"launchpad.net/juju-core/environs"
17
	"launchpad.net/juju-core/environs"
1044
16
	"launchpad.net/juju-core/environs/cloudinit"
18
	"launchpad.net/juju-core/environs/cloudinit"
1045
@@ -89,7 +91,7 @@
1046
89
	}
91
	}
1047
90
92
1048
91
	// Finally, provision the machine agent.
93
	// Finally, provision the machine agent.
1050
92
	err = ProvisionMachineAgent(args.Host, mcfg)
94
	err = provisionMachineAgent(args.Host, mcfg)
1051
93
	if err != nil {
95
	if err != nil {
1052
94
		return machineId, err
96
		return machineId, err
1053
95
	}
97
	}
1054
@@ -202,3 +204,14 @@
1055
202
	}
204
	}
1056
203
	return mcfg, nil
205
	return mcfg, nil
1057
204
}
206
}
1058
207
1059
208
func provisionMachineAgent(host string, mcfg *cloudinit.MachineConfig) error {
1060
209
	cloudcfg := coreCloudinit.New()
1061
210
	if err := cloudinit.ConfigureJuju(mcfg, cloudcfg); err != nil {
1062
211
		return err
1063
212
	}
1064
213
	// Explicitly disabling apt_upgrade so as not to trample
1065
214
	// the target machine's existing configuration.
1066
215
	cloudcfg.SetAptUpgrade(false)
1067
216
	return sshinit.Configure(host, cloudcfg)
1068
217
}
1069
205
218
1070
=== modified file 'environs/sshstorage/storage.go'
1071
--- environs/sshstorage/storage.go	2013-10-10 01:31:43 +0000
1072
+++ environs/sshstorage/storage.go	2013-12-03 06:15:09 +0000
1073
@@ -20,6 +20,7 @@
1074
20
20
1075
21
	coreerrors "launchpad.net/juju-core/errors"
21
	coreerrors "launchpad.net/juju-core/errors"
1076
22
	"launchpad.net/juju-core/utils"
22
	"launchpad.net/juju-core/utils"
1077
23
	"launchpad.net/juju-core/utils/ssh"
1078
23
)
24
)
1079
24
25
1080
25
// base64LineLength is the default line length for wrapping
26
// base64LineLength is the default line length for wrapping
1081
@@ -44,12 +45,11 @@
1082
44
}
45
}
1083
45
46
1084
46
var sshCommand = func(host string, tty bool, command string) *exec.Cmd {
47
var sshCommand = func(host string, tty bool, command string) *exec.Cmd {
1086
47
	sshArgs := []string{host}
48
	var options []ssh.Option
1087
48
	if tty {
49
	if tty {
1089
49
		sshArgs = append(sshArgs, "-t")
50
		options = append(options, ssh.AllocateTTY)
1090
50
	}
51
	}
1093
51
	sshArgs = append(sshArgs, "--", command)
52
	return ssh.Command(host, []string{command}, options...)
1092
52
	return exec.Command("ssh", sshArgs...)
1094
53
}
53
}
1095
54
54
1096
55
type flockmode string
55
type flockmode string
1097
56
56
1098
=== added file 'environs/testing/bootstrap.go'
1099
--- environs/testing/bootstrap.go	1970-01-01 00:00:00 +0000
1100
+++ environs/testing/bootstrap.go	2013-12-03 06:15:09 +0000
1101
@@ -0,0 +1,26 @@
1102
1
// Copyright 2013 Canonical Ltd.
1103
2
// Licensed under the AGPLv3, see LICENCE file for details.
1104
3
1105
4
package testing
1106
5
1107
6
import (
1108
7
	"launchpad.net/loggo"
1109
8
1110
9
	"launchpad.net/juju-core/environs/cloudinit"
1111
10
	"launchpad.net/juju-core/instance"
1112
11
	"launchpad.net/juju-core/provider/common"
1113
12
	"launchpad.net/juju-core/testing/testbase"
1114
13
)
1115
14
1116
15
var logger = loggo.GetLogger("juju.environs.testing")
1117
16
1118
17
// DisableFinishBootstrap disables common.FinishBootstrap so that tests
1119
18
// do not attempt to SSH to non-existent machines. The result is a function
1120
19
// that restores finishBootstrap.
1121
20
func DisableFinishBootstrap() func() {
1122
21
	f := func(*common.BootstrapContext, instance.Instance, *cloudinit.MachineConfig) error {
1123
22
		logger.Warningf("provider/common.FinishBootstrap is disabled")
1124
23
		return nil
1125
24
	}
1126
25
	return testbase.PatchValue(&common.FinishBootstrap, f)
1127
26
}
1128
0
27
1129
=== modified file 'provider/common/bootstrap.go'
1130
--- provider/common/bootstrap.go	2013-11-18 04:53:44 +0000
1131
+++ provider/common/bootstrap.go	2013-12-03 06:15:09 +0000
1132
@@ -5,12 +5,21 @@
1133
5
5
1134
6
import (
6
import (
1135
7
	"fmt"
7
	"fmt"
1136
8
	"net"
1137
9
	"os"
1138
10
	"os/signal"
1139
11
	"sync"
1140
12
	"time"
1141
8
13
1142
9
	"launchpad.net/loggo"
14
	"launchpad.net/loggo"
1143
15
	"launchpad.net/tomb"
1144
10
16
1145
17
	coreCloudinit "launchpad.net/juju-core/cloudinit"
1146
18
	"launchpad.net/juju-core/cloudinit/sshinit"
1147
11
	"launchpad.net/juju-core/constraints"
19
	"launchpad.net/juju-core/constraints"
1148
12
	"launchpad.net/juju-core/environs"
20
	"launchpad.net/juju-core/environs"
1149
13
	"launchpad.net/juju-core/environs/bootstrap"
21
	"launchpad.net/juju-core/environs/bootstrap"
1150
22
	"launchpad.net/juju-core/environs/cloudinit"
1151
14
	"launchpad.net/juju-core/instance"
23
	"launchpad.net/juju-core/instance"
1152
15
	coretools "launchpad.net/juju-core/tools"
24
	coretools "launchpad.net/juju-core/tools"
1153
16
)
25
)
1154
@@ -20,11 +29,20 @@
1155
20
// Bootstrap is a common implementation of the Bootstrap method defined on
29
// Bootstrap is a common implementation of the Bootstrap method defined on
1156
21
// environs.Environ; we strongly recommend that this implementation be used
30
// environs.Environ; we strongly recommend that this implementation be used
1157
22
// when writing a new provider.
31
// when writing a new provider.
1159
23
func Bootstrap(env environs.Environ, cons constraints.Value) error {
32
func Bootstrap(env environs.Environ, cons constraints.Value) (err error) {
1160
24
	// TODO make safe in the case of racing Bootstraps
33
	// TODO make safe in the case of racing Bootstraps
1161
25
	// If two Bootstraps are called concurrently, there's
34
	// If two Bootstraps are called concurrently, there's
1162
26
	// no way to make sure that only one succeeds.
35
	// no way to make sure that only one succeeds.
1163
27
36
1164
37
	// TODO(axw) 2013-11-22 #1237736
1165
38
	// Modify environs/Environ Bootstrap method signature
1166
39
	// to take a new context structure, which contains
1167
40
	// Std{in,out,err}, and interrupt signal handling.
1168
41
	ctx := BootstrapContext{Stderr: os.Stderr}
1169
42
1170
43
	var inst instance.Instance
1171
44
	defer func() { handleBootstrapError(err, &ctx, inst, env) }()
1172
45
1173
28
	// Create an empty bootstrap state file so we can get its URL.
46
	// Create an empty bootstrap state file so we can get its URL.
1174
29
	// It will be updated with the instance id and hardware characteristics
47
	// It will be updated with the instance id and hardware characteristics
1175
30
	// after the bootstrap instance is started.
48
	// after the bootstrap instance is started.
1176
@@ -39,10 +57,13 @@
1177
39
		return err
57
		return err
1178
40
	}
58
	}
1179
41
59
1180
60
	fmt.Fprintln(ctx.Stderr, "Launching instance")
1181
42
	inst, hw, err := env.StartInstance(cons, selectedTools, machineConfig)
61
	inst, hw, err := env.StartInstance(cons, selectedTools, machineConfig)
1182
43
	if err != nil {
62
	if err != nil {
1183
44
		return fmt.Errorf("cannot start bootstrap instance: %v", err)
63
		return fmt.Errorf("cannot start bootstrap instance: %v", err)
1184
45
	}
64
	}
1185
65
	fmt.Fprintf(ctx.Stderr, " - %s\n", inst.Id())
1186
66
1187
46
	var characteristics []instance.HardwareCharacteristics
67
	var characteristics []instance.HardwareCharacteristics
1188
47
	if hw != nil {
68
	if hw != nil {
1189
48
		characteristics = []instance.HardwareCharacteristics{*hw}
69
		characteristics = []instance.HardwareCharacteristics{*hw}
1190
@@ -54,14 +75,148 @@
1191
54
			Characteristics: characteristics,
75
			Characteristics: characteristics,
1192
55
		})
76
		})
1193
56
	if err != nil {
77
	if err != nil {
1197
57
		stoperr := env.StopInstances([]instance.Instance{inst})
78
		return fmt.Errorf("cannot save state: %v", err)
1198
58
		if stoperr != nil {
79
	}
1199
59
			// Failure upon failure.  Log it, but return the original error.
80
	return FinishBootstrap(&ctx, inst, machineConfig)
1200
81
}
1201
82
1202
83
// handelBootstrapError cleans up after a failed bootstrap.
1203
84
func handleBootstrapError(err error, ctx *BootstrapContext, inst instance.Instance, env environs.Environ) {
1204
85
	if err == nil {
1205
86
		return
1206
87
	}
1207
88
	ctx.SetInterruptHandler(func() {
1208
89
		fmt.Fprintln(ctx.Stderr, "Cleaning up failed bootstrap")
1209
90
	})
1210
91
	if inst != nil {
1211
92
		fmt.Fprintln(ctx.Stderr, "Stopping instance...")
1212
93
		if stoperr := env.StopInstances([]instance.Instance{inst}); stoperr != nil {
1213
60
			logger.Errorf("cannot stop failed bootstrap instance %q: %v", inst.Id(), stoperr)
94
			logger.Errorf("cannot stop failed bootstrap instance %q: %v", inst.Id(), stoperr)
1218
61
		}
95
		} else {
1219
62
		return fmt.Errorf("cannot save state: %v", err)
96
			// set to nil so we know we can safely delete the state file
1220
63
	}
97
			inst = nil
1221
64
	return nil
98
		}
1222
99
	}
1223
100
	// We only delete the bootstrap state file if either we didn't
1224
101
	// start an instance, or we managed to cleanly stop it.
1225
102
	if inst == nil {
1226
103
		if rmerr := bootstrap.DeleteStateFile(env.Storage()); rmerr != nil {
1227
104
			logger.Errorf("cannot delete bootstrap state file: %v", rmerr)
1228
105
		}
1229
106
	}
1230
107
	ctx.SetInterruptHandler(nil)
1231
108
}
1232
109
1233
110
// FinishBootstrap completes the bootstrap process by connecting
1234
111
// to the instance via SSH and carrying out the cloud-config.
1235
112
//
1236
113
// Note: FinishBootstrap is exposed so it can be replaced for testing.
1237
114
var FinishBootstrap = func(ctx *BootstrapContext, inst instance.Instance, machineConfig *cloudinit.MachineConfig) error {
1238
115
	var t tomb.Tomb
1239
116
	ctx.SetInterruptHandler(func() { t.Killf("interrupted") })
1240
117
	dnsName, err := waitSSH(ctx, inst, &t)
1241
118
	if err != nil {
1242
119
		return err
1243
120
	}
1244
121
	// Bootstrap is synchronous, and will spawn a subprocess
1245
122
	// to complete the procedure. If the user hits Ctrl-C,
1246
123
	// SIGINT is sent to the foreground process attached to
1247
124
	// the terminal, which will be the ssh subprocess at that
1248
125
	// point.
1249
126
	ctx.SetInterruptHandler(func() {})
1250
127
	cloudcfg := coreCloudinit.New()
1251
128
	if err := cloudinit.ConfigureJuju(machineConfig, cloudcfg); err != nil {
1252
129
		return err
1253
130
	}
1254
131
	return sshinit.Configure("ubuntu@"+dnsName, cloudcfg)
1255
132
}
1256
133
1257
134
// waitSSH waits for the instance to be assigned a DNS
1258
135
// entry, then waits until we can connect to it via SSH.
1259
136
func waitSSH(ctx *BootstrapContext, inst instance.Instance, t *tomb.Tomb) (dnsName string, err error) {
1260
137
	defer t.Done()
1261
138
1262
139
	// Wait for a DNS name.
1263
140
	fmt.Fprint(ctx.Stderr, "Waiting for DNS name")
1264
141
	for {
1265
142
		fmt.Fprintf(ctx.Stderr, ".")
1266
143
		dnsName, err = inst.DNSName()
1267
144
		if err == nil {
1268
145
			break
1269
146
		} else if err != instance.ErrNoDNSName {
1270
147
			fmt.Fprintln(ctx.Stderr)
1271
148
			return "", t.Killf("getting DNS name: %v", err)
1272
149
		}
1273
150
		select {
1274
151
		case <-time.After(1 * time.Second):
1275
152
		case <-t.Dying():
1276
153
			fmt.Fprintln(ctx.Stderr)
1277
154
			return "", t.Err()
1278
155
		}
1279
156
	}
1280
157
	fmt.Fprintf(ctx.Stderr, "\n - %v\n", dnsName)
1281
158
1282
159
	// Wait until we can open a connection to port 22.
1283
160
	fmt.Fprintf(ctx.Stderr, "Attempting to connect to %s:22", dnsName)
1284
161
	for {
1285
162
		fmt.Fprintf(ctx.Stderr, ".")
1286
163
		conn, err := net.DialTimeout("tcp", dnsName+":22", 5*time.Second)
1287
164
		if err == nil {
1288
165
			conn.Close()
1289
166
			fmt.Fprintln(ctx.Stderr)
1290
167
			return dnsName, nil
1291
168
		} else {
1292
169
			logger.Debugf("connection failed: %v", err)
1293
170
		}
1294
171
		select {
1295
172
		case <-time.After(5 * time.Second):
1296
173
		case <-t.Dying():
1297
174
			return "", t.Err()
1298
175
		}
1299
176
	}
1300
177
}
1301
178
1302
179
// TODO(axw) move this to environs; see
1303
180
// comment near the top of common.Bootstrap.
1304
181
type BootstrapContext struct {
1305
182
	once        sync.Once
1306
183
	handlerchan chan func()
1307
184
1308
185
	Stderr *os.File
1309
186
}
1310
187
1311
188
func (ctx *BootstrapContext) SetInterruptHandler(f func()) {
1312
189
	ctx.once.Do(ctx.initHandler)
1313
190
	ctx.handlerchan <- f
1314
191
}
1315
192
1316
193
func (ctx *BootstrapContext) initHandler() {
1317
194
	ctx.handlerchan = make(chan func())
1318
195
	go ctx.handleInterrupt()
1319
196
}
1320
197
1321
198
func (ctx *BootstrapContext) handleInterrupt() {
1322
199
	signalchan := make(chan os.Signal, 1)
1323
200
	var s chan os.Signal
1324
201
	var handler func()
1325
202
	for {
1326
203
		select {
1327
204
		case handler = <-ctx.handlerchan:
1328
205
			if handler == nil {
1329
206
				if s != nil {
1330
207
					signal.Stop(signalchan)
1331
208
					s = nil
1332
209
				}
1333
210
			} else {
1334
211
				if s == nil {
1335
212
					s = signalchan
1336
213
					signal.Notify(signalchan, os.Interrupt)
1337
214
				}
1338
215
			}
1339
216
		case <-s:
1340
217
			handler()
1341
218
		}
1342
219
	}
1343
65
}
220
}
1344
66
221
1345
67
// EnsureBootstrapTools finds tools, syncing with an external tools source as
222
// EnsureBootstrapTools finds tools, syncing with an external tools source as
1346
68
223
1347
=== modified file 'provider/common/bootstrap_test.go'
1348
--- provider/common/bootstrap_test.go	2013-11-18 04:53:44 +0000
1349
+++ provider/common/bootstrap_test.go	2013-12-03 06:15:09 +0000
1350
@@ -197,6 +197,9 @@
1351
197
		return minimalConfig(c)
197
		return minimalConfig(c)
1352
198
	}
198
	}
1353
199
199
1354
200
	restore := envtesting.DisableFinishBootstrap()
1355
201
	defer restore()
1356
202
1357
200
	env := &mockEnviron{
203
	env := &mockEnviron{
1358
201
		storage:       stor,
204
		storage:       stor,
1359
202
		startInstance: startInstance,
205
		startInstance: startInstance,
1360
203
206
1361
=== modified file 'provider/ec2/local_test.go'
1362
--- provider/ec2/local_test.go	2013-11-18 05:41:36 +0000
1363
+++ provider/ec2/local_test.go	2013-12-03 06:15:09 +0000
1364
@@ -222,26 +222,28 @@
1365
222
222
1366
223
	// check that the user data is configured to start zookeeper
223
	// check that the user data is configured to start zookeeper
1367
224
	// and the machine and provisioning agents.
224
	// and the machine and provisioning agents.
1368
225
	// check that the user data is configured to only configure
1369
226
	// authorized SSH keys and set the log output; everything
1370
227
	// else happens after the machine is brought up.
1371
225
	inst := t.srv.ec2srv.Instance(string(insts[0].Id()))
228
	inst := t.srv.ec2srv.Instance(string(insts[0].Id()))
1372
226
	c.Assert(inst, gc.NotNil)
229
	c.Assert(inst, gc.NotNil)
1373
227
	bootstrapDNS, err := insts[0].DNSName()
230
	bootstrapDNS, err := insts[0].DNSName()
1374
228
	c.Assert(err, gc.IsNil)
231
	c.Assert(err, gc.IsNil)
1375
229
	c.Assert(bootstrapDNS, gc.Not(gc.Equals), "")
232
	c.Assert(bootstrapDNS, gc.Not(gc.Equals), "")
1376
230
1377
231
	userData, err := utils.Gunzip(inst.UserData)
233
	userData, err := utils.Gunzip(inst.UserData)
1378
232
	c.Assert(err, gc.IsNil)
234
	c.Assert(err, gc.IsNil)
1379
233
	c.Logf("first instance: UserData: %q", userData)
235
	c.Logf("first instance: UserData: %q", userData)
1380
234
	var userDataMap map[interface{}]interface{}
236
	var userDataMap map[interface{}]interface{}
1381
235
	err = goyaml.Unmarshal(userData, &userDataMap)
237
	err = goyaml.Unmarshal(userData, &userDataMap)
1382
236
	c.Assert(err, gc.IsNil)
238
	c.Assert(err, gc.IsNil)
1387
237
	CheckPackage(c, userDataMap, "git", true)
239
	c.Assert(userDataMap, gc.DeepEquals, map[interface{}]interface{}{
1388
238
	CheckScripts(c, userDataMap, "jujud bootstrap-state", true)
240
		"output": map[interface{}]interface{}{
1389
239
	// TODO check for provisioning agent
241
			"all": "| tee -a /var/log/cloud-init-output.log",
1390
240
	// TODO check for machine agent
242
		},
1391
243
		"ssh_authorized_keys": []interface{}{"my-keys"},
1392
244
	})
1393
241
245
1397
242
	// check that a new instance will be started without
246
	// check that a new instance will be started with a machine agent
1395
243
	// zookeeper, with a machine agent, and without a
1396
244
	// provisioning agent.
1398
245
	inst1, hc := testing.AssertStartInstance(c, env, "1")
247
	inst1, hc := testing.AssertStartInstance(c, env, "1")
1399
246
	c.Check(*hc.Arch, gc.Equals, "amd64")
248
	c.Check(*hc.Arch, gc.Equals, "amd64")
1400
247
	c.Check(*hc.Mem, gc.Equals, uint64(1740))
249
	c.Check(*hc.Mem, gc.Equals, uint64(1740))
1401
@@ -255,9 +257,11 @@
1402
255
	userDataMap = nil
257
	userDataMap = nil
1403
256
	err = goyaml.Unmarshal(userData, &userDataMap)
258
	err = goyaml.Unmarshal(userData, &userDataMap)
1404
257
	c.Assert(err, gc.IsNil)
259
	c.Assert(err, gc.IsNil)
1406
258
	CheckPackage(c, userDataMap, "zookeeperd", false)
260
	CheckPackage(c, userDataMap, "git", true)
1407
261
	CheckPackage(c, userDataMap, "mongodb-server", false)
1408
262
	CheckScripts(c, userDataMap, "jujud bootstrap-state", false)
1409
263
	CheckScripts(c, userDataMap, "/var/lib/juju/agents/machine-1/agent.conf", true)
1410
259
	// TODO check for provisioning agent
264
	// TODO check for provisioning agent
1411
260
	// TODO check for machine agent
1412
261
265
1413
262
	err = env.Destroy()
266
	err = env.Destroy()
1414
263
	c.Assert(err, gc.IsNil)
267
	c.Assert(err, gc.IsNil)
1415
@@ -408,7 +412,9 @@
1416
408
	ec2.UseTestInstanceTypeData(ec2.TestInstanceTypeCosts)
412
	ec2.UseTestInstanceTypeData(ec2.TestInstanceTypeCosts)
1417
409
	ec2.UseTestRegionData(ec2.TestRegions)
413
	ec2.UseTestRegionData(ec2.TestRegions)
1418
410
	restoreTimeouts := envtesting.PatchAttemptStrategies(ec2.ShortAttempt, ec2.StorageAttempt)
414
	restoreTimeouts := envtesting.PatchAttemptStrategies(ec2.ShortAttempt, ec2.StorageAttempt)
1419
415
	restoreFinishBootstrap := envtesting.DisableFinishBootstrap()
1420
411
	return func() {
416
	return func() {
1421
417
		restoreFinishBootstrap()
1422
412
		restoreTimeouts()
418
		restoreTimeouts()
1423
413
		ec2.UseTestImageData(nil)
419
		ec2.UseTestImageData(nil)
1424
414
		ec2.UseTestInstanceTypeData(nil)
420
		ec2.UseTestInstanceTypeData(nil)
1425
415
421
1426
=== modified file 'provider/maas/maas_test.go'
1427
--- provider/maas/maas_test.go	2013-11-26 12:24:48 +0000
1428
+++ provider/maas/maas_test.go	2013-12-03 06:15:09 +0000
1429
@@ -33,6 +33,8 @@
1430
33
	s.LoggingSuite.SetUpSuite(c)
33
	s.LoggingSuite.SetUpSuite(c)
1431
34
	TestMAASObject := gomaasapi.NewTestMAAS("1.0")
34
	TestMAASObject := gomaasapi.NewTestMAAS("1.0")
1432
35
	s.testMAASObject = TestMAASObject
35
	s.testMAASObject = TestMAASObject
1433
36
	restoreFinishBootstrap := envtesting.DisableFinishBootstrap()
1434
37
	s.AddSuiteCleanup(func(*gc.C) { restoreFinishBootstrap() })
1435
36
}
38
}
1436
37
39
1437
38
func (s *providerSuite) SetUpTest(c *gc.C) {
40
func (s *providerSuite) SetUpTest(c *gc.C) {
1438
39
41
1439
=== modified file 'provider/openstack/local_test.go'
1440
--- provider/openstack/local_test.go	2013-11-18 05:41:36 +0000
1441
+++ provider/openstack/local_test.go	2013-12-03 06:15:09 +0000
1442
@@ -167,6 +167,8 @@
1443
167
	s.srv.start(c, s.cred)
167
	s.srv.start(c, s.cred)
1444
168
	s.LiveTests.SetUpSuite(c)
168
	s.LiveTests.SetUpSuite(c)
1445
169
	openstack.UseTestImageData(openstack.ImageMetadataStorage(s.Env), s.cred)
169
	openstack.UseTestImageData(openstack.ImageMetadataStorage(s.Env), s.cred)
1446
170
	restoreFinishBootstrap := envtesting.DisableFinishBootstrap()
1447
171
	s.AddSuiteCleanup(func(*gc.C) { restoreFinishBootstrap() })
1448
170
}
172
}
1449
171
173
1450
172
func (s *localLiveSuite) TearDownSuite(c *gc.C) {
174
func (s *localLiveSuite) TearDownSuite(c *gc.C) {
1451
@@ -203,6 +205,8 @@
1452
203
func (s *localServerSuite) SetUpSuite(c *gc.C) {
205
func (s *localServerSuite) SetUpSuite(c *gc.C) {
1453
204
	s.LoggingSuite.SetUpSuite(c)
206
	s.LoggingSuite.SetUpSuite(c)
1454
205
	s.Tests.SetUpSuite(c)
207
	s.Tests.SetUpSuite(c)
1455
208
	restoreFinishBootstrap := envtesting.DisableFinishBootstrap()
1456
209
	s.AddSuiteCleanup(func(*gc.C) { restoreFinishBootstrap() })
1457
206
	c.Logf("Running local tests")
210
	c.Logf("Running local tests")
1458
207
}
211
}
1459
208
212
1460
@@ -740,6 +744,9 @@
1461
740
}
744
}
1462
741
745
1463
742
func (s *localHTTPSServerSuite) TestCanBootstrap(c *gc.C) {
746
func (s *localHTTPSServerSuite) TestCanBootstrap(c *gc.C) {
1464
747
	restoreFinishBootstrap := envtesting.DisableFinishBootstrap()
1465
748
	defer restoreFinishBootstrap()
1466
749
1467
743
	// For testing, we create a storage instance to which is uploaded tools and image metadata.
750
	// For testing, we create a storage instance to which is uploaded tools and image metadata.
1468
744
	metadataStorage := openstack.MetadataStorage(s.env)
751
	metadataStorage := openstack.MetadataStorage(s.env)
1469
745
	url, err := metadataStorage.URL("")
752
	url, err := metadataStorage.URL("")
1470
746
753
1471
=== added directory 'utils/ssh'
1472
=== renamed file 'environs/manual/ssh.go' => 'utils/ssh/ssh.go'
1473
--- environs/manual/ssh.go	2013-09-12 02:04:05 +0000
1474
+++ utils/ssh/ssh.go	2013-12-03 06:15:09 +0000
1475
@@ -1,25 +1,45 @@
1476
1
// Copyright 2013 Canonical Ltd.
1
// Copyright 2013 Canonical Ltd.
1477
2
// Licensed under the AGPLv3, see LICENCE file for details.
2
// Licensed under the AGPLv3, see LICENCE file for details.
1478
3
3
1480
4
package manual
4
package ssh
1481
5
5
1482
6
import (
6
import (
1483
7
	"os/exec"
7
	"os/exec"
1484
8
)
8
)
1485
9
9
1496
10
type sshOption []string
10
type Option []string
1497
11
11
1498
12
var allocateTTY sshOption = []string{"-t"}
12
var (
1499
13
13
	commonOptions Option = []string{"-o", "StrictHostKeyChecking no"}
1500
14
// TODO(axw) 2013-09-12 bug #1224230
14
1501
15
// Move this to a common package for use in cmd/juju, and others.
15
	// AllocateTTY forces pseudo-TTY allocation, which is required,
1502
16
var commonSSHOptions = []string{"-o", "StrictHostKeyChecking no"}
16
	// for example, for sudo password prompts on the target host.
1503
17
17
	AllocateTTY Option = []string{"-t"}
1504
18
func sshCommand(host string, command string, options ...sshOption) *exec.Cmd {
18
1505
19
	args := append([]string{}, commonSSHOptions...)
19
	// NoPasswordAuthentication disallows password-based authentication.
1506
20
	NoPasswordAuthentication Option = []string{"-o", "PasswordAuthentication no"}
1507
21
)
1508
22
1509
23
// Command initialises an os/exec.Cmd to execute the native ssh program.
1510
24
func Command(host string, command []string, options ...Option) *exec.Cmd {
1511
25
	args := append([]string{}, commonOptions...)
1512
20
	for _, option := range options {
26
	for _, option := range options {
1513
21
		args = append(args, option...)
27
		args = append(args, option...)
1514
22
	}
28
	}
1516
23
	args = append(args, host, "--", command)
29
	args = append(args, host)
1517
30
	if len(command) > 0 {
1518
31
		args = append(args, "--")
1519
32
		args = append(args, command...)
1520
33
	}
1521
24
	return exec.Command("ssh", args...)
34
	return exec.Command("ssh", args...)
1522
25
}
35
}
1523
36
1524
37
// ScpCommand initialises an os/exec.Cmd to execute the native scp program.
1525
38
func ScpCommand(source, destination string, options ...Option) *exec.Cmd {
1526
39
	args := append([]string{}, commonOptions...)
1527
40
	for _, option := range options {
1528
41
		args = append(args, option...)
1529
42
	}
1530
43
	args = append(args, source, destination)
1531
44
	return exec.Command("scp", args...)
1532
45
}
Status:	Merged
Approved by:	Andrew Wilkins on 2013-12-03
Approved revision:	no longer in the source branch.
Merged at revision:	2116
Proposed branch:	lp:~axwalk/juju-core/synchronous-bootstrap
Merge into:	lp:~go-bot/juju-core/trunk
Diff against target:	1532 lines (+680/-120) 30 files modified cloudinit/cloudinit_test.go (+31/-0) cloudinit/options.go (+21/-0) cloudinit/progress.go (+43/-0) cloudinit/progress_test.go (+27/-0) cloudinit/sshinit/configure.go (+45/-29) cloudinit/sshinit/configure_test.go (+68/-18) cloudinit/sshinit/suite_test.go (+14/-0) cmd/juju/debughooks.go (+1/-1) cmd/juju/debughooks_test.go (+3/-3) cmd/juju/scp.go (+2/-4) cmd/juju/scp_test.go (+1/-1) cmd/juju/ssh.go (+8/-4) cmd/juju/ssh_test.go (+7/-7) environs/bootstrap/state.go (+5/-0) environs/bootstrap/state_test.go (+21/-0) environs/cloudinit.go (+10/-3) environs/cloudinit/cloudinit.go (+56/-8) environs/cloudinit/cloudinit_test.go (+8/-0) environs/cloudinit_test.go (+38/-4) environs/manual/bootstrap.go (+1/-1) environs/manual/detection.go (+3/-2) environs/manual/provisioner.go (+14/-1) environs/sshstorage/storage.go (+4/-4) environs/testing/bootstrap.go (+26/-0) provider/common/bootstrap.go (+163/-8) provider/common/bootstrap_test.go (+3/-0) provider/ec2/local_test.go (+16/-10) provider/maas/maas_test.go (+2/-0) provider/openstack/local_test.go (+7/-0) utils/ssh/ssh.go (+32/-12)
To merge this branch:	bzr merge lp:~axwalk/juju-core/synchronous-bootstrap
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2013-11-21	Pending
Review via email: mp+196058@code.launchpad.net