Juju Charms Collection
rutabaga package

Merge lp:~blr/charms/trusty/rutabaga/auth-helper-relation into lp:~canonical-launchpad-branches/charms/trusty/rutabaga/devel

  1. Trusty Tahr (14.04)
  2. auth-helper-relation
  3. Merge into devel
Proposed by Kit Randel
Status: Merged
Merged at revision: 19
Proposed branch: lp:~blr/charms/trusty/rutabaga/auth-helper-relation
Merge into: lp:~canonical-launchpad-branches/charms/trusty/rutabaga/devel
Diff against target: 53 lines (+14/-1)
3 files modified
hooks/actions.py (+9/-0)
hooks/services.py (+1/-0)
metadata.yaml (+4/-1)
To merge this branch: bzr merge lp:~blr/charms/trusty/rutabaga/auth-helper-relation
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+278921@code.launchpad.net

Commit message

Define auth-helper interface and publish relation.

To post a comment you must log in.
lp:~blr/charms/trusty/rutabaga/auth-helper-relation updated
28. By Kit Randel

Rename auth-helper to squid-auth-helper.

Revision history for this message
Colin Watson (cjwatson) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'hooks/actions.py'
2--- hooks/actions.py 2015-11-25 03:08:57 +0000
3+++ hooks/actions.py 2015-11-30 03:01:23 +0000
4@@ -252,10 +252,19 @@
5 return env_vars
6
7
8+def publish_squid_auth_helper_relation(service_name):
9+ # Publish the squid-auth-helper relation so that squid can run,
10+ # now that the auth helper is in place.
11+ hookenv.log('Publishing squid-auth-helper relations...')
12+ for relid in hookenv.relation_ids('squid-auth-helper'):
13+ hookenv.relation_set(relid)
14+
15+
16 def publish_wsgi_relations(service_name):
17 # Publish the wsgi-file relation so the gunicorn subordinate can
18 # serve us. Other WSGI containers could be made to work, as the most
19 # gunicorn-specific thing is the --paste hack.
20+ hookenv.log('Publishing wsgi relations...')
21 config = hookenv.config()
22 env = get_env_vars()
23 for relid in hookenv.relation_ids('wsgi-file'):
24
25=== modified file 'hooks/services.py'
26--- hooks/services.py 2015-11-09 00:49:25 +0000
27+++ hooks/services.py 2015-11-30 03:01:23 +0000
28@@ -79,6 +79,7 @@
29 ],
30 'start': [
31 actions.publish_wsgi_relations,
32+ actions.publish_squid_auth_helper_relation,
33 manage_ports,
34 ],
35 'stop': [
36
37=== modified file 'metadata.yaml'
38--- metadata.yaml 2015-09-20 22:20:28 +0000
39+++ metadata.yaml 2015-11-30 03:01:23 +0000
40@@ -14,8 +14,11 @@
41 scope: container
42 rutabaga-api:
43 interface: rutabaga-http
44+ squid-auth-helper:
45+ interface: squid-auth-helper
46 website:
47 interface: http
48 nrpe-external-master:
49 interface: nrpe-external-master
50- scope: container
51\ No newline at end of file
52+ scope: container
53+

Subscribers

People subscribed via source and target branches

to all changes: