Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Patch/update schema juju 2.3 alpha1 #142

Merged
merged 3 commits into from Jun 13, 2017

Conversation

adam-stokes
Copy link

No description provided.

Adam Stokes added 2 commits June 13, 2017 13:00
Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
@adam-stokes adam-stokes requested a review from johnsca June 13, 2017 17:01
This verifies that integration tests pass locally on Juju 2.3-alpha1

Signed-off-by: Adam Stokes <battlemidget@users.noreply.github.com>
@adam-stokes adam-stokes force-pushed the patch/update-schema-juju-2.3-alpha1 branch from 930c93c to 2bf42e4 Compare June 13, 2017 18:29
@johnsca johnsca merged commit d6348ef into master Jun 13, 2017
@adam-stokes adam-stokes deleted the patch/update-schema-juju-2.3-alpha1 branch June 13, 2017 19:20
jujubot added a commit that referenced this pull request Nov 8, 2021
#566

### Description

This PR adds the support for overlays in bundle deployments.

Fixes #510 

This PR relies on a change in Juju's api for getting changes for bundles with overlays (multi-part yaml support), juju/juju#13448.

Jira card [#142](https://warthogs.atlassian.net/browse/JUJU-142)



### QA Steps

`tests/integration/test_model.py` includes some new tests for the added support.

```
tox -e integration -- tests/integration/test_model.py
```

### Notes & Discussion

Please do not merge yet, as a couple of small things need to be done/added for this to be ready to land:

- [x] Add a PR on Juju for `GetChange` juju/juju#13448
- [x] Land that PR on Juju
- [x] Charmstore bundles with `--overlay` argument, along with its test
- [x] A test for a multi-part overlay as an `--overlay` argument to a local bundle being deployed
- [x] A test for a multi-part overlay as an `--overlay` argument to a charmstore bundle being deployed
- [x] Make sure that we resolve and inline `config: include-file://` and `config: include-base64://` here in `pylibjuju` side
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

2 participants