/juju

update to LXD master tip #4639

Merged
merged 9 commits into from Mar 10, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
2 participants
@jameinel @jujubot
@jameinel
Owner

jameinel commented Mar 7, 2016

The changes to LXD have now landed in master, so this is now worth landing.

The recent patch from Tycho also introduced https://pad.lv/1555585, which this addresses. Also, this adds support for the existing "image-stream: released/daily" configuration item. If you set "image-stream:daily" then when you "juju bootstrap blah lxd" it should use the daily stream for images instead of the released stream.

(Review request: http://reviews.vapour.ws/r/4082/)

jameinel added some commits Mar 7, 2016

@jameinel
Work on updating to 2.0.0.rc1 
We need a couple tweaks to 2.0.0.rc1 in order to be able to easily
connect to the simplestreams remotes. Also, a few of the APIs changed
slightly from 2.0.0.beta4. So update our code to match while working
on the Remotes changes.
38ed1ee
@jameinel
try to have a helper that lets us connect to the 'known' remotes.
e629697
@jameinel
We don't need a default image alias
1d67f5a
@jameinel
Add ImageStream as part of lxdclient.Config
2f0474d
@jameinel
Allow us to connect to one of the known LXD hosts.
1f2fdae
@jameinel
notes on a test case
d06e5aa
@jameinel
merge master, start working on resolving issues.
bd9e145
@jameinel
Bring in the latest lxd trunk. 
This lets us switch how we connect to upstream 'ubuntu', which should fix bug #1555585.
It also hooks up 'image-stream' through config into the LXD connection, which changes what
source we use for grabbing upstream images. Needs testing, though.
6a2e2ac

@jameinel jameinel changed the title from WIP:update LXD to 2.0.0.rc1 to update to LXD master tip Mar 10, 2016

@jameinel
Owner

jameinel commented Mar 10, 2016

$$merge$$ fixes-1551276 fixes-1555585
@jujubot
Contributor

jujubot commented Mar 10, 2016

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

jujubot added a commit that referenced this pull request Mar 10, 2016

@jujubot
Merge pull request #4639 from jameinel/lxd-update-2.0.0.rc1 
update to LXD master tip

The changes to LXD have now landed in master, so this is now worth landing.

The recent patch from Tycho also introduced https://pad.lv/1555585, which this addresses. Also, this adds support for the existing "image-stream: released/daily" configuration item. If you set "image-stream:daily" then when you "juju bootstrap blah lxd" it should use the daily stream for images instead of the released stream.

(Review request: http://reviews.vapour.ws/r/4082/)
0572521

@jujubot jujubot merged commit 0572521 into juju:master Mar 10, 2016

@jameinel jameinel deleted the jameinel:lxd-update-2.0.0.rc1 branch Dec 13, 2016

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment