Merge ~pwlars/revcache/+git/revcache-charm:fix-config-defaults into ~canonical-hw-cert/revcache/+git/revcache-charm:master

Proposed by Paul Larson
Status: Merged
Approved by: Paul Larson
Approved revision: fd9ad1c3f3a3c8d27749bf86a4f777b2d98d9ad5
Merged at revision: 8855a325653ee13dcff47f5e49ef05fba43c256e
Proposed branch: ~pwlars/revcache/+git/revcache-charm:fix-config-defaults
Merge into: ~canonical-hw-cert/revcache/+git/revcache-charm:master
Diff against target: 30 lines (+3/-2)
2 files modified
config.yaml (+2/-2)
playbooks/revcache.yaml (+1/-0)
Reviewer Review Type Date Requested Status
Paul Larson Approve
Review via email: mp+348910@code.launchpad.net

Description of the change

Fixes some bad defaults (which are easy to work around, but better to have the right defaults). Also, I think that having the config file written at config-changed time *might* be better. It's hard to test, because even at relation-changed time, it's kind of bad right now. Juju doesn't always fill in the variables the way it's supposed to.

To post a comment you must log in.
Revision history for this message
Paul Larson (pwlars) wrote :

I'm iterating on these minor fixes right now, would like to go ahead and land/deploy this

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1diff --git a/config.yaml b/config.yaml
2index 1e4601f..3068278 100644
3--- a/config.yaml
4+++ b/config.yaml
5@@ -2,11 +2,11 @@ options:
6 revcache-repo:
7 type: string
8 description: git repo for revcache
9- default: "https://git.launchpad.net/~pwlars/revcache"
10+ default: "https://git.launchpad.net/revcache"
11 revcache-branch:
12 type: string
13 description: git branch for revcache
14- default: "start"
15+ default: "master"
16 config-ssl-certificate:
17 type: string
18 description: base64 encoded ssl certificate file
19diff --git a/playbooks/revcache.yaml b/playbooks/revcache.yaml
20index 1057b38..627b82f 100644
21--- a/playbooks/revcache.yaml
22+++ b/playbooks/revcache.yaml
23@@ -74,6 +74,7 @@
24 tags:
25 - db-relation-joined
26 - db-relation-changed
27+ - config-changed
28
29 - name: Install Revcache
30 shell: ". {{ service_dir }}/env/bin/activate && ./setup.py install"

Subscribers

People subscribed via source and target branches