Rietveld Code Review Tool
Help | Bug tracker | Discussion group | Source code | Sign in
(1611)

Issue 52900045: Eliminate MachineConfig client API

Can't Edit
Can't Publish+Mail
Start Review
Created:
10 years, 3 months ago by axw
Modified:
10 years, 3 months ago
Reviewers:
gz, mp+202592
Visibility:
Public.

Description

Eliminate MachineConfig client API The MachineConfig API has been superseded by ProvisioningScript for manual provisioning. Manual provisioning has been updated to use ProvisioningScript, and MachineConfig removed as it was added in the 1.17.0 release, and so is unsupported. Accordingly, statecmd.MachineConfig has been combined with statecmd.FinishMachineConfig, and it deals directly with the environs/config MachineConfig struct. Fixes #1270043 https://code.launchpad.net/~axwalk/juju-core/lp1270043-drop-machineconfig-api/+merge/202592 (do not edit description out of merge proposal)

Patch Set 1 #

Total comments: 8

Patch Set 2 : Eliminate MachineConfig client API #

Unified diffs Side-by-side diffs Delta from patch set Stats (+159 lines, -189 lines) Patch
A [revision details] View 1 1 chunk +2 lines, -0 lines 0 comments Download
M cloudinit/sshinit/configure.go View 1 2 chunks +12 lines, -4 lines 0 comments Download
M environs/manual/provisioner.go View 1 2 chunks +32 lines, -19 lines 0 comments Download
M environs/manual/provisioner_test.go View 1 chunk +1 line, -4 lines 0 comments Download
M provider/common/bootstrap.go View 1 1 chunk +4 lines, -4 lines 0 comments Download
M state/api/client.go View 1 chunk +0 lines, -10 lines 0 comments Download
M state/api/params/params.go View 2 chunks +0 lines, -18 lines 0 comments Download
M state/apiserver/client/client.go View 1 chunk +1 line, -11 lines 0 comments Download
M state/apiserver/client/client_test.go View 4 chunks +1 line, -71 lines 0 comments Download
M state/statecmd/machineconfig.go View 2 chunks +16 lines, -48 lines 0 comments Download
A state/statecmd/machineconfig_test.go View 1 1 chunk +90 lines, -0 lines 0 comments Download

Messages

Total messages: 3
axw
Please take a look.
10 years, 3 months ago (2014-01-22 03:46:56 UTC) #1
gz
LGTM, please land for 1.17.1 release. :) https://codereview.appspot.com/52900045/diff/1/cloudinit/sshinit/configure.go File cloudinit/sshinit/configure.go (right): https://codereview.appspot.com/52900045/diff/1/cloudinit/sshinit/configure.go#newcode45 cloudinit/sshinit/configure.go:45: // Run ...
10 years, 3 months ago (2014-01-23 13:43:37 UTC) #2
axw
10 years, 3 months ago (2014-01-23 23:20:11 UTC) #3
Please take a look.

https://codereview.appspot.com/52900045/diff/1/cloudinit/sshinit/configure.go
File cloudinit/sshinit/configure.go (right):

https://codereview.appspot.com/52900045/diff/1/cloudinit/sshinit/configure.go...
cloudinit/sshinit/configure.go:45: // Run connects to the specified host over
SSH,
On 2014/01/23 13:43:37, gz wrote:
> *RunConfigureScript

Done.

https://codereview.appspot.com/52900045/diff/1/cloudinit/sshinit/configure.go...
cloudinit/sshinit/configure.go:49: logger.Infof("Provisioning machine agent on
%s", params.Host)
On 2014/01/23 13:43:37, gz wrote:
> Why move this log line later? Having it right next to the debug one below is
> just a little silly, and it seemed fine where it was (logging even if
> ConfigureScript errored).

I moved it because not everything uses Configure, and DEBUG may not be enabled.
Manual provisioning uses ConfigureScript and RunConfigureScript separately. It
doesn't really matter; I will move the log line back.

https://codereview.appspot.com/52900045/diff/1/environs/manual/provisioner.go
File environs/manual/provisioner.go (right):

https://codereview.appspot.com/52900045/diff/1/environs/manual/provisioner.go...
environs/manual/provisioner.go:293: func provisionMachineAgent(host string, mcfg
*cloudinit.MachineConfig, stderr io.Writer) error {
On 2014/01/23 13:43:37, gz wrote:
> Pre-exisiting nit, naming the writer 'stderr' when it can be any writer is
> confusing.

Yeah, good call. I've renamed to progressWriter. Also renamed
sshinit.ConfigureParams.Stderr to ProgressWriter.

https://codereview.appspot.com/52900045/diff/1/state/statecmd/machineconfig_t...
File state/statecmd/machineconfig_test.go (right):

https://codereview.appspot.com/52900045/diff/1/state/statecmd/machineconfig_t...
state/statecmd/machineconfig_test.go:57: c.Assert(machineConfig.APIInfo.Addrs,
gc.DeepEquals, apiInfo.Addrs)
On 2014/01/23 13:43:37, gz wrote:
> These two DeepEquals Asserts could be Check instead?

Done.
Sign in to reply to this message.

Powered by Google App Engine
RSS Feeds Recent Issues | This issue
This is Rietveld f62528b