migrations: Add AdoptInstances to lxd provider #6827

Merged
merged 4 commits into from Jan 18, 2017

Conversation

Projects
None yet
3 participants
Member

babbageclunk commented Jan 18, 2017

Part of https://bugs.launchpad.net/juju/+bug/1648063

Implement AdoptInstances in the lxd provider using client.SetContainerConfig.

QA steps - none, this code isn't runnable until the migration master is updated.

babbageclunk added some commits Jan 17, 2017

Rename lxdclient SetConfig to SetServerConfig
In preparation for adding SetContainerConfig (needed for updating
controller tags on instances after migration).
Added SetContainerConfig to the lxdclient wrapper
This will be called from environ.MoveInstancesToController.
Member

babbageclunk commented Jan 18, 2017

!!chittychitty!!

axw approved these changes Jan 18, 2017

provider/lxd/environ_instance.go
@@ -123,3 +123,22 @@ func (env *environ) parsePlacement(placement string) (*instPlacement, error) {
return nil, errors.Errorf("unknown placement directive: %v", placement)
}
+
+// MoveInstancesToController updates the controller tags on the
@axw

axw Jan 18, 2017

Member

MoveInstancesToController is a bit of a mouthful. How about "AdoptInstances", to keep it brief?

@babbageclunk

babbageclunk Jan 18, 2017

Member

Yeah, I think I prefer AdoptInstances.

Member

babbageclunk commented Jan 18, 2017

$$merge$$

Contributor

jujubot commented Jan 18, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

Contributor

jujubot commented Jan 18, 2017

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/10049

Member

babbageclunk commented Jan 18, 2017

Seems spurious - it's lxd failing to bootstrap, but I can bootstrap locally fine.
$$merge$$

Contributor

jujubot commented Jan 18, 2017

Status: merge request accepted. Url: http://juju-ci.vapour.ws:8080/job/github-merge-juju

@babbageclunk babbageclunk changed the title from migrations: Add MoveInstancesToController to lxd provider to migrations: Add AdoptInstances to lxd provider Jan 18, 2017

@jujubot jujubot merged commit e5fed33 into juju:2.1 Jan 18, 2017

1 check failed

github-check-merge-juju Built PR, ran unit tests, and tested LXD deploy. Use !!.*!! to request another build. IE, !!build!!, !!retry!!
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment