1
=== modified file 'agent/format-1.16.go'
2
--- agent/format-1.16.go	2014-02-04 19:12:08 +0000
3
+++ agent/format-1.16.go	2014-02-13 00:39:39 +0000
4
@@ -17,10 +17,10 @@
5
17
const (
17
const (
6
18
	format_1_16 = "format 1.16"
18
	format_1_16 = "format 1.16"
7
19
	// Old environment variables that are now stored in agent config.
19
	// Old environment variables that are now stored in agent config.
12
20
	JujuLxcBridge    = "JUJU_LXC_BRIDGE"
20
	jujuLxcBridge    = "JUJU_LXC_BRIDGE"
13
21
	JujuProviderType = "JUJU_PROVIDER_TYPE"
21
	jujuProviderType = "JUJU_PROVIDER_TYPE"
14
22
	JujuStorageDir   = "JUJU_STORAGE_DIR"
22
	jujuStorageDir   = "JUJU_STORAGE_DIR"
15
23
	JujuStorageAddr  = "JUJU_STORAGE_ADDR"
23
	jujuStorageAddr  = "JUJU_STORAGE_ADDR"
16
24
)
24
)
17
25
25
18
26
// formatter_1_16 is the formatter for the 1.16 format.
26
// formatter_1_16 is the formatter for the 1.16 format.
19
@@ -176,19 +176,19 @@
20
176
		environment string
176
		environment string
21
177
		config      string
177
		config      string
22
178
	}{{
178
	}{{
24
179
		JujuProviderType,
179
		jujuProviderType,
25
180
		ProviderType,
180
		ProviderType,
26
181
	}, {
181
	}, {
27
182
		osenv.JujuContainerTypeEnvKey,
182
		osenv.JujuContainerTypeEnvKey,
28
183
		ContainerType,
183
		ContainerType,
29
184
	}, {
184
	}, {
31
185
		JujuLxcBridge,
185
		jujuLxcBridge,
32
186
		LxcBridge,
186
		LxcBridge,
33
187
	}, {
187
	}, {
35
188
		JujuStorageDir,
188
		jujuStorageDir,
36
189
		StorageDir,
189
		StorageDir,
37
190
	}, {
190
	}, {
39
191
		JujuStorageAddr,
191
		jujuStorageAddr,
40
192
		StorageAddr,
192
		StorageAddr,
41
193
	}} {
193
	}} {
42
194
		value := os.Getenv(name.environment)
194
		value := os.Getenv(name.environment)
43
195
195
44
=== modified file 'agent/format-1.16_whitebox_test.go'
45
--- agent/format-1.16_whitebox_test.go	2014-02-04 19:12:08 +0000
46
+++ agent/format-1.16_whitebox_test.go	2014-02-13 00:39:39 +0000
47
@@ -97,11 +97,11 @@
48
97
}
97
}
49
98
98
50
99
func (s *format_1_16Suite) TestMigrate(c *gc.C) {
99
func (s *format_1_16Suite) TestMigrate(c *gc.C) {
53
100
	s.PatchEnvironment(JujuLxcBridge, "lxc bridge")
100
	s.PatchEnvironment(jujuLxcBridge, "lxc bridge")
54
101
	s.PatchEnvironment(JujuProviderType, "provider type")
101
	s.PatchEnvironment(jujuProviderType, "provider type")
55
102
	s.PatchEnvironment(osenv.JujuContainerTypeEnvKey, "container type")
102
	s.PatchEnvironment(osenv.JujuContainerTypeEnvKey, "container type")
58
103
	s.PatchEnvironment(JujuStorageDir, "storage dir")
103
	s.PatchEnvironment(jujuStorageDir, "storage dir")
59
104
	s.PatchEnvironment(JujuStorageAddr, "storage addr")
104
	s.PatchEnvironment(jujuStorageAddr, "storage addr")
60
105
105
61
106
	config := newTestConfig(c)
106
	config := newTestConfig(c)
62
107
	s.formatter.migrate(config)
107
	s.formatter.migrate(config)
63
@@ -118,7 +118,7 @@
64
118
}
118
}
65
119
119
66
120
func (s *format_1_16Suite) TestMigrateOnlySetsExisting(c *gc.C) {
120
func (s *format_1_16Suite) TestMigrateOnlySetsExisting(c *gc.C) {
68
121
	s.PatchEnvironment(JujuProviderType, "provider type")
121
	s.PatchEnvironment(jujuProviderType, "provider type")
69
122
122
70
123
	config := newTestConfig(c)
123
	config := newTestConfig(c)
71
124
	s.formatter.migrate(config)
124
	s.formatter.migrate(config)
72
125
125
73
=== modified file 'worker/machineenvironmentworker/machineenvironmentworker.go'
74
--- worker/machineenvironmentworker/machineenvironmentworker.go	2014-01-29 04:59:18 +0000
75
+++ worker/machineenvironmentworker/machineenvironmentworker.go	2014-02-13 00:39:39 +0000
76
@@ -65,8 +65,9 @@
77
65
func NewMachineEnvironmentWorker(api *environment.Facade, agentConfig agent.Config) worker.Worker {
65
func NewMachineEnvironmentWorker(api *environment.Facade, agentConfig agent.Config) worker.Worker {
78
66
	// We don't write out system files for the local provider on machine zero
66
	// We don't write out system files for the local provider on machine zero
79
67
	// as that is the host machine.
67
	// as that is the host machine.
82
68
	writeSystemFiles := !(agentConfig.Tag() == names.MachineTag("0") &&
68
	writeSystemFiles := (agentConfig.Tag() != names.MachineTag("0") ||
83
69
		agentConfig.Value(agent.JujuProviderType) == provider.Local)
69
		agentConfig.Value(agent.ProviderType) != provider.Local)
84
70
	logger.Debugf("write system files: %v", writeSystemFiles)
85
70
	envWorker := &MachineEnvironmentWorker{
71
	envWorker := &MachineEnvironmentWorker{
86
71
		api:              api,
72
		api:              api,
87
72
		writeSystemFiles: writeSystemFiles,
73
		writeSystemFiles: writeSystemFiles,
88
73
74
89
=== modified file 'worker/machineenvironmentworker/machineenvironmentworker_test.go'
90
--- worker/machineenvironmentworker/machineenvironmentworker_test.go	2014-01-28 03:12:34 +0000
91
+++ worker/machineenvironmentworker/machineenvironmentworker_test.go	2014-02-13 00:39:39 +0000
92
@@ -211,7 +211,7 @@
93
211
}
211
}
94
212
212
95
213
func (mock *mockConfig) Value(key string) string {
213
func (mock *mockConfig) Value(key string) string {
97
214
	if key == agent.JujuProviderType {
214
	if key == agent.ProviderType {
98
215
		return mock.provider
215
		return mock.provider
99
216
	}
216
	}
100
217
	return ""
217
	return ""
Reviewer	Review Type	Date Requested	Status
Juju Engineering		2014-02-11	Pending
Review via email: mp+205864@code.launchpad.net