/juju

provider/lxd: drop all existing config #6078

Merged
merged 1 commit into from Aug 24, 2016

Conversation

Reviewers
No reviews
Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
3 participants
@axw @wallyworld @jujubot
@axw
Member

axw commented Aug 24, 2016 •
Edited 1 time

The LXD provider is updated such that the
LXD host address and certificates are no
longer stored in model config. This makes
it possible to drop the following:

  • EnvironProvider.RestrictedConfigAttributes
  • EnvironProvider.SecretAttrs
  • on-the-fly addition and removal of credential
    attributes to/from model config

(which we will do in a follow-up)

(Review request: http://reviews.vapour.ws/r/5520/)
@axw
Member

axw commented Aug 24, 2016

QA

  1. bootstrap lxd
  2. enable-ha -m controller
  3. add-machine -m default --series=precise
  4. add-machine -m default --series=trusty
  5. add-machine -m default --series=xenial
  6. bootstrap azure
  7. add-machine lxd

(and observe that all machines start)
provider/lxd/environ_broker.go
+ }
+ cert := lxdclient.NewCert(certPEM, keyPEM)
+ cert.Name = hostname
+ // TODO(axw) we need to remove this cert when removing
@wallyworld

wallyworld Aug 24, 2016

Owner

This is worthy of a bug I think. Existing behaviour IIANM, but still...

@axw

axw Aug 24, 2016

Member

Filed https://bugs.launchpad.net/juju/+bug/1616346

provider/lxd/environ_raw.go
"github.com/juju/juju/network"
"github.com/juju/juju/provider/common"
"github.com/juju/juju/tools/lxdclient"
)
+var (
+ jujuConfDir = jujupaths.MustSucceed(jujupaths.ConfDir("xenial"))
@wallyworld

wallyworld Aug 24, 2016

Owner

why hard code xenial?

@axw

axw Aug 24, 2016

Member

paths.ConfDir expects a series. We need an Ubuntu series. Do you have an alternative suggestion?

@wallyworld

wallyworld Aug 24, 2016

Owner

config.LatestLts() ? or whatever it is

@axw

axw Aug 24, 2016

Member

Done, though I think it was fine as it was.

@wallyworld
Owner

wallyworld commented Aug 24, 2016

LGTM
@axw
Member

axw commented Aug 24, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Aug 24, 2016

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

jujubot commented Aug 24, 2016

Build failed: Tests failed
build url: http://juju-ci.vapour.ws:8080/job/github-merge-juju/8909
@axw
provider/lxd: drop all existing config 
The LXD provider is updated such that the
LXD host address and certificates are no
longer stored in model config. This makes
it possible to drop the following:
 - EnvironProvider.RestrictedConfigAttributes
 - EnvironProvider.SecretAttrs
 - on-the-fly addition and removal of credential
   attributes to/from model config
This commit was signed with a verified signature.
@axw axw Andrew Wilkins
GPG key ID: 55314F7628952B05 Learn about signing commits
9417385
@axw
Member

axw commented Aug 24, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Aug 24, 2016

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

@jujubot jujubot merged commit 056eb13 into juju:master Aug 24, 2016

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