/charm

Add series attribute to bundles #197

Merged
merged 2 commits into from Mar 10, 2016

Conversation

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

wallyworld commented Mar 10, 2016

Bundle allow a series to be specified. It is an error to specify a series and a charm store charm. Series only applies to local charms.
bundledata.go
@@ -68,6 +68,11 @@ type ServiceSpec struct {
// use for the given service.
Charm string
+ // Series is the series to use when deploying the charm
@axw

axw Mar 10, 2016

Member

worth mentioning here that the series may not be specified for cs: charms?

@wallyworld

wallyworld Mar 10, 2016

Owner

done

bundledata.go
+
+ // Check the series.
+ if curl != nil && svc.Series != "" {
+ verifier.addErrorf("service %q declares both a series and a charm store URL", name)
@axw

axw Mar 10, 2016

Member

"store" in the message may not be accurate in the future, if we add additional URL schemes

@wallyworld

wallyworld Mar 10, 2016

Owner

done

@axw
Member

axw commented Mar 10, 2016

LGTM with a couple of quibbles
@wallyworld
Owner

wallyworld commented Mar 10, 2016

$$merge$$
@jujubot
Contributor

jujubot commented Mar 10, 2016

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

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

@jujubot
Merge pull request #197 from wallyworld/add-bundle-series-attribute 
Add series attribute to bundles

Bundle allow a series to be specified. It is an error to specify a series and a charm store charm. Series only applies to local charms.
9984092

@jujubot jujubot merged commit 9984092 into juju:v6-unstable Mar 10, 2016

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