1
=== modified file 'provider/maas/environ.go'
2
--- provider/maas/environ.go	2014-03-19 19:35:33 +0000
3
+++ provider/maas/environ.go	2014-03-20 09:13:42 +0000
4
@@ -276,8 +276,7 @@
5
276
	if err != nil {
276
	if err != nil {
6
277
		return nil, nil, err
277
		return nil, nil, err
7
278
	}
278
	}
10
279
	info := machineInfo{hostname}
279
	additionalScripts, err := additionalScripts(hostname)
9
280
	runCmd, err := info.cloudinitRunCmd()
11
281
	if err != nil {
280
	if err != nil {
12
282
		return nil, nil, err
281
		return nil, nil, err
13
283
	}
282
	}
14
@@ -288,14 +287,7 @@
15
288
	// The machine envronment config values are being moved to the agent config.
287
	// The machine envronment config values are being moved to the agent config.
16
289
	// Explicitly specify that the lxc containers use the network bridge defined above.
288
	// Explicitly specify that the lxc containers use the network bridge defined above.
17
290
	args.MachineConfig.AgentEnvironment[agent.LxcBridge] = "br0"
289
	args.MachineConfig.AgentEnvironment[agent.LxcBridge] = "br0"
26
291
	userdata, err := environs.ComposeUserData(
290
	userdata, err := environs.ComposeUserData(args.MachineConfig, additionalScripts...)
19
292
		args.MachineConfig,
20
293
		runCmd,
21
294
		"apt-get install bridge-utils",
22
295
		createBridgeNetwork(),
23
296
		linkBridgeInInterfaces(),
24
297
		"service networking restart",
25
298
	)
27
299
	if err != nil {
291
	if err != nil {
28
300
		msg := fmt.Errorf("could not compose userdata for bootstrap node: %v", err)
292
		msg := fmt.Errorf("could not compose userdata for bootstrap node: %v", err)
29
301
		return nil, nil, msg
293
		return nil, nil, msg
30
@@ -311,6 +303,25 @@
31
311
	return inst, nil, nil
303
	return inst, nil, nil
32
312
}
304
}
33
313
305
34
306
// additionalScripts is an additional set of commands
35
307
// to run during cloud-init (before the synchronous phase).
36
308
func additionalScripts(hostname string) ([]string, error) {
37
309
	info := machineInfo{hostname}
38
310
	runCmd, err := info.cloudinitRunCmd()
39
311
	if err != nil {
40
312
		return nil, err
41
313
	}
42
314
	return []string{
43
315
		runCmd,
44
316
		utils.CommandString(utils.AptGetCommand("update")...),
45
317
		utils.CommandString(utils.AptGetCommand("install", "bridge-utils")...),
46
318
		"ifdown eth0",
47
319
		createBridgeNetwork(),
48
320
		linkBridgeInInterfaces(),
49
321
		"ifup br0",
50
322
	}, nil
51
323
}
52
324
53
314
// StartInstance is specified in the InstanceBroker interface.
325
// StartInstance is specified in the InstanceBroker interface.
54
315
func (environ *maasEnviron) StopInstances(instances []instance.Instance) error {
326
func (environ *maasEnviron) StopInstances(instances []instance.Instance) error {
55
316
	// Shortcut to exit quickly if 'instances' is an empty slice or nil.
327
	// Shortcut to exit quickly if 'instances' is an empty slice or nil.
56
317
328
57
=== modified file 'provider/maas/environ_test.go'
58
--- provider/maas/environ_test.go	2014-03-19 01:20:14 +0000
59
+++ provider/maas/environ_test.go	2014-03-20 09:13:42 +0000
60
@@ -203,3 +203,18 @@
61
203
	c.Assert(err, gc.IsNil)
203
	c.Assert(err, gc.IsNil)
62
204
	c.Assert(a, gc.DeepEquals, arch.AllSupportedArches)
204
	c.Assert(a, gc.DeepEquals, arch.AllSupportedArches)
63
205
}
205
}
64
206
65
207
func (*environSuite) TestAdditionalSCripts(c *gc.C) {
66
208
	const aptGetPrefix = "env DEBIAN_FRONTEND=noninteractive apt-get --option=Dpkg::Options::=--force-confold --option=Dpkg::options::=--force-unsafe-io --assume-yes --quiet"
67
209
	scripts, err := maas.AdditionalScripts("testing.invalid")
68
210
	c.Assert(err, gc.IsNil)
69
211
	c.Assert(scripts, gc.DeepEquals, []string{
70
212
		"mkdir -p '/var/lib/juju'; echo -n 'hostname: testing.invalid\n' > '/var/lib/juju/MAASmachine.txt'",
71
213
		aptGetPrefix + " update",
72
214
		aptGetPrefix + " install bridge-utils",
73
215
		"ifdown eth0",
74
216
		"cat > /etc/network/eth0.config << EOF\niface eth0 inet manual\n\nauto br0\niface br0 inet dhcp\n  bridge_ports eth0\nEOF\n",
75
217
		`sed -i "s/iface eth0 inet dhcp/source \/etc\/network\/eth0.config/" /etc/network/interfaces`,
76
218
		"ifup br0",
77
219
	})
78
220
}
79
206
221
80
=== modified file 'provider/maas/export_test.go'
81
--- provider/maas/export_test.go	2013-12-06 11:00:58 +0000
82
+++ provider/maas/export_test.go	2014-03-20 09:13:42 +0000
83
@@ -10,8 +10,9 @@
84
10
)
10
)
85
11
11
86
12
var (
12
var (
89
13
	ShortAttempt = &shortAttempt
13
	ShortAttempt      = &shortAttempt
90
14
	APIVersion   = apiVersion
14
	APIVersion        = apiVersion
91
15
	AdditionalScripts = additionalScripts
92
15
)
16
)
93
16
17
94
17
func MAASAgentName(env environs.Environ) string {
18
func MAASAgentName(env environs.Environ) string {
95
18
19
96
=== modified file 'utils/apt.go'
97
--- utils/apt.go	2014-03-13 20:51:48 +0000
98
+++ utils/apt.go	2014-03-20 09:13:42 +0000
99
@@ -81,6 +81,16 @@
100
81
	}
81
	}
101
82
}
82
}
102
83
83
103
84
// AptGetCommand returns a command to execute apt-get
104
85
// with the specified arguments, and the appropriate
105
86
// environment variables and options for a non-interactive
106
87
// session.
107
88
func AptGetCommand(args ...string) []string {
108
89
	cmd := append([]string{"env"}, aptGetEnvOptions...)
109
90
	cmd = append(cmd, aptGetCommand...)
110
91
	return append(cmd, args...)
111
92
}
112
93
113
84
// AptGetPreparePackages returns a slice of installCommands. Each item
94
// AptGetPreparePackages returns a slice of installCommands. Each item
114
85
// in the slice is suitable for passing directly to AptGetInstall.
95
// in the slice is suitable for passing directly to AptGetInstall.
115
86
//
96
//
116
87
97
117
=== modified file 'utils/apt_test.go'
118
--- utils/apt_test.go	2014-03-13 20:52:41 +0000
119
+++ utils/apt_test.go	2014-03-20 09:13:42 +0000
120
@@ -39,6 +39,22 @@
121
39
	c.Assert(packagesList[1], gc.DeepEquals, []string{"bridge-utils", "git"})
39
	c.Assert(packagesList[1], gc.DeepEquals, []string{"bridge-utils", "git"})
122
40
}
40
}
123
41
41
124
42
func (s *AptSuite) TestAptGetCommand(c *gc.C) {
125
43
	s.testAptGetCommand(c)
126
44
	s.testAptGetCommand(c, "install", "foo")
127
45
}
128
46
129
47
func (s *AptSuite) testAptGetCommand(c *gc.C, args ...string) {
130
48
	commonArgs := []string{
131
49
		"env", "DEBIAN_FRONTEND=noninteractive",
132
50
		"apt-get", "--option=Dpkg::Options::=--force-confold",
133
51
		"--option=Dpkg::options::=--force-unsafe-io", "--assume-yes", "--quiet",
134
52
	}
135
53
	expected := append(commonArgs, args...)
136
54
	cmd := utils.AptGetCommand(args...)
137
55
	c.Assert(cmd, gc.DeepEquals, expected)
138
56
}
139
57
140
42
func (s *AptSuite) TestAptGetError(c *gc.C) {
58
func (s *AptSuite) TestAptGetError(c *gc.C) {
141
43
	const expected = `E: frobnicator failure detected`
59
	const expected = `E: frobnicator failure detected`
142
44
	cmdError := fmt.Errorf("error")
60
	cmdError := fmt.Errorf("error")
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-03-20	Pending
Review via email: mp+211886@code.launchpad.net