Juju Charms Collection
rutabaga package

Merge lp:~cjwatson/charms/trusty/rutabaga/nrpe-compat into lp:~canonical-launchpad-branches/charms/trusty/rutabaga/devel

  1. Trusty Tahr (14.04)
  2. nrpe-compat
  3. Merge into devel
Proposed by Colin Watson
Status: Merged
Merged at revision: 37
Proposed branch: lp:~cjwatson/charms/trusty/rutabaga/nrpe-compat
Merge into: lp:~canonical-launchpad-branches/charms/trusty/rutabaga/devel
Diff against target: 53 lines (+23/-5)
2 files modified
hooks/actions.py (+12/-4)
hooks/services.py (+11/-1)
To merge this branch: bzr merge lp:~cjwatson/charms/trusty/rutabaga/nrpe-compat
Reviewer Review Type Date Requested Status
Guillermo Gonzalez (community) Approve
Launchpad code reviewers Pending
Review via email: mp+359748@code.launchpad.net

Commit message

Support newer versions of the nrpe charm.

Description of the change

This is a bit of a hack, but can be simplified once all deployments have been upgraded.

To post a comment you must log in.
Revision history for this message
Guillermo Gonzalez (verterok) wrote :

+1

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 2016-12-09 13:08:30 +0000
3+++ hooks/actions.py 2018-11-28 13:16:25 +0000
4@@ -218,10 +218,18 @@
5 # Only makes sense with basenode.
6 if not config['log_hosts_allow']:
7 return
8- concat_rsync_fragments = '/usr/local/bin/concat_rsync_fragments'
9- if not os.path.exists(concat_rsync_fragments):
10- return
11- subprocess.check_call([concat_rsync_fragments])
12+ # New versions of the nrpe charm use a different system that doesn't
13+ # require manual concatenation.
14+ concat = True
15+ if os.path.exists('/etc/rsyncd.conf'):
16+ with open('/etc/rsyncd.conf') as rsyncd_conf:
17+ if '&include /etc/rsync-juju.d' in rsyncd_conf.read():
18+ concat = False
19+ if concat:
20+ concat_rsync_fragments = '/usr/local/bin/concat_rsync_fragments'
21+ if not os.path.exists(concat_rsync_fragments):
22+ return
23+ subprocess.check_call([concat_rsync_fragments])
24 service_restart('rsync')
25
26
27
28=== modified file 'hooks/services.py'
29--- hooks/services.py 2016-04-25 16:51:10 +0000
30+++ hooks/services.py 2018-11-28 13:16:25 +0000
31@@ -22,11 +22,21 @@
32 owner=owner, group=group, perms=perms)
33
34
35+def render_old_rsync_template(config):
36+ if config['log_hosts_allow']:
37+ return helpers.render_template(
38+ source='rutabaga-rsync.j2',
39+ target='/etc/rsyncd.d/010-rutabaga',
40+ perms=0o644)
41+ else:
42+ return lambda _: None
43+
44+
45 def render_rsync_template(config):
46 if config['log_hosts_allow']:
47 return helpers.render_template(
48 source='rutabaga-rsync.j2',
49- target='/etc/rsyncd.d/010-rutabaga',
50+ target='/etc/rsync-juju.d/010-rutabaga.conf',
51 perms=0o644)
52 else:
53 return lambda _: None

Subscribers

People subscribed via source and target branches

to all changes: