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
diff --git a/config.yaml b/config.yaml
index 1e4601f..3068278 100644
--- a/config.yaml
+++ b/config.yaml
@@ -2,11 +2,11 @@ options:
2 revcache-repo:2 revcache-repo:
3 type: string3 type: string
4 description: git repo for revcache4 description: git repo for revcache
5 default: "https://git.launchpad.net/~pwlars/revcache"5 default: "https://git.launchpad.net/revcache"
6 revcache-branch:6 revcache-branch:
7 type: string7 type: string
8 description: git branch for revcache8 description: git branch for revcache
9 default: "start"9 default: "master"
10 config-ssl-certificate:10 config-ssl-certificate:
11 type: string11 type: string
12 description: base64 encoded ssl certificate file12 description: base64 encoded ssl certificate file
diff --git a/playbooks/revcache.yaml b/playbooks/revcache.yaml
index 1057b38..627b82f 100644
--- a/playbooks/revcache.yaml
+++ b/playbooks/revcache.yaml
@@ -74,6 +74,7 @@
74 tags:74 tags:
75 - db-relation-joined75 - db-relation-joined
76 - db-relation-changed76 - db-relation-changed
77 - config-changed
7778
78 - name: Install Revcache79 - name: Install Revcache
79 shell: ". {{ service_dir }}/env/bin/activate && ./setup.py install"80 shell: ". {{ service_dir }}/env/bin/activate && ./setup.py install"

Subscribers

People subscribed via source and target branches