Reviewers: mp+205864_code.launchpad.net,
Message: Please take a look.
Description: Fix the key we are looking for.
We were looking for the wrong key to determine whether to write system files or not.
https://code.launchpad.net/~thumper/juju-core/fix-provider-query-in-machine-env-worker/+merge/205864
(do not edit description out of merge proposal)
Please review this at https://codereview.appspot.com/61990043/
Affected files (+4, -1 lines): A [revision details] M worker/machineenvironmentworker/machineenvironmentworker.go
Index: [revision details] === added file '[revision details]' --- [revision details] 2012-01-01 00:00:00 +0000 +++ [revision details] 2012-01-01 00:00:00 +0000 @@ -0,0 +1,2 @@ +Old revision: tarmac-20140211202026-scgo0kk0wmhgy1oq +New revision: <email address hidden>
Index: worker/machineenvironmentworker/machineenvironmentworker.go === modified file 'worker/machineenvironmentworker/machineenvironmentworker.go' --- worker/machineenvironmentworker/machineenvironmentworker.go 2014-01-29 04:59:18 +0000 +++ worker/machineenvironmentworker/machineenvironmentworker.go 2014-02-07 06:42:39 +0000 @@ -66,7 +66,8 @@ // We don't write out system files for the local provider on machine zero // as that is the host machine. writeSystemFiles := !(agentConfig.Tag() == names.MachineTag("0") && - agentConfig.Value(agent.JujuProviderType) == provider.Local) + agentConfig.Value(agent.ProviderType) == provider.Local) + logger.Debugf("write system files: %v", writeSystemFiles) envWorker := &MachineEnvironmentWorker{ api: api, writeSystemFiles: writeSystemFiles,
« Back to merge proposal
Reviewers: mp+205864_ code.launchpad. net,
Message:
Please take a look.
Description:
Fix the key we are looking for.
We were looking for the wrong key to determine whether
to write system files or not.
https:/ /code.launchpad .net/~thumper/ juju-core/ fix-provider- query-in- machine- env-worker/ +merge/ 205864
(do not edit description out of merge proposal)
Please review this at https:/ /codereview. appspot. com/61990043/
Affected files (+4, -1 lines): machineenvironm entworker/ machineenvironm entworker. go
A [revision details]
M worker/
Index: [revision details] 20140211202026- scgo0kk0wmhgy1o q
=== added file '[revision details]'
--- [revision details] 2012-01-01 00:00:00 +0000
+++ [revision details] 2012-01-01 00:00:00 +0000
@@ -0,0 +1,2 @@
+Old revision: tarmac-
+New revision: <email address hidden>
Index: worker/ machineenvironm entworker/ machineenvironm entworker. go machineenvironm entworker/ machineenvironm entworker. go' machineenvironm entworker/ machineenvironm entworker. go 2014-01-29 machineenvironm entworker/ machineenvironm entworker. go 2014-02-07 g("0") && Value(agent. JujuProviderTyp e) == provider.Local) Value(agent. ProviderType) == provider.Local) Debugf( "write system files: %v", writeSystemFiles) mentWorker{ Files: writeSystemFiles,
=== modified
file 'worker/
--- worker/
04:59:18 +0000
+++ worker/
06:42:39 +0000
@@ -66,7 +66,8 @@
// We don't write out system files for the local provider on machine zero
// as that is the host machine.
writeSystemFiles := !(agentConfig.Tag() == names.MachineTa
- agentConfig.
+ agentConfig.
+ logger.
envWorker := &MachineEnviron
api: api,
writeSystem