/juju

Add container support for model-config cloudinit-userdata. #8211

Merged
merged 1 commit into from Dec 13, 2017

Conversation

Reviewers

@wallyworld wallyworld

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

hmlanigan commented Dec 13, 2017 •
Edited 1 time

Description of change

Use the data provided in model-config cloudinit-userdata by adding it to the juju created
cloudinit files used for containers provisioned on juju machines. This is a follow-on to PR 8188.

This PR will be followed up with changes to handle bootcmd like runcmd is.

QA steps

  1. unit tests
  2. create a yaml file with cloudinit-userdata defined.
  3. bootstrap with the bootstrap config and the model default config using the above yaml
  4. add a machine with a container to the default model.
  5. ssh to the controller, the juju machine, and the juju container to verify things specified in the yaml file happened.

Documentation changes

N/A

Bug reference

N/A
@hmlanigan
Member

hmlanigan commented Dec 13, 2017

cloudinit-userdata to containers
worker/provisioner/broker_test.go
+ callback environs.StatusCallbackFunc,
+) (instance.Instance, *instance.HardwareCharacteristics, error) {
+ m.MethodCall(m, "CreateContainer", instanceConfig, cons, series, network, storage, callback)
+ //return nil, nil, m.NextErr()
@wallyworld

wallyworld Dec 13, 2017

Owner

delete me?

@hmlanigan

hmlanigan Dec 13, 2017

Member

deleted.

@hmlanigan
Member

hmlanigan commented Dec 13, 2017

$$merge$$
@jujubot
Contributor

jujubot commented Dec 13, 2017

Status: merge request accepted. Url: http://ci.jujucharms.com/job/github-merge-juju

@jujubot jujubot merged commit 77dd3bf into juju:2.3 Dec 13, 2017
1 check failed

1 check failed

continuous-integration/jenkins/pr-merge This commit cannot be built
Details

@hmlanigan hmlanigan deleted the hmlanigan:cloudinit-part3 branch Dec 13, 2017

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