Merge lp:~bloodearnest/charms/trusty/conn-check/trunk into lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk

Proposed by Simon Davy on 2015-09-30
Status: Merged
Approved by: Wes Mason on 2015-10-01
Approved revision: 47
Merged at revision: 48
Proposed branch: lp:~bloodearnest/charms/trusty/conn-check/trunk
Merge into: lp:~ubuntuone-hackers/charms/trusty/conn-check/trunk
Diff against target: 46 lines (+9/-3)
3 files modified
Makefile (+1/-1)
hooks/hooks.py (+0/-1)
playbook.yaml (+8/-1)
To merge this branch: bzr merge lp:~bloodearnest/charms/trusty/conn-check/trunk
Reviewer Review Type Date Requested Status
Wes Mason (community) 2015-09-30 Approve on 2015-10-01
Review via email: mp+272946@code.launchpad.net

Commit message

Ensure nagios group can always read the config file.

Description of the change

Ensure nagios group can always read the config file.

To post a comment you must log in.
Wes Mason (wesmason) wrote :

lgtm

review: Approve
Ubuntu One Auto Pilot (otto-pilot) wrote :

There was a problem validating some authors of the branch. Authors must be either one of the listed Launchpad users, or a member of one of the listed teams on Launchpad.

Persons or Teams:

    canonical-losas
    ubuntuone-hackers

Unaccepted Authors:

    root <email address hidden>

47. By Simon Davy on 2015-09-30

ensure group read permissions on config file

Wes Mason (wesmason) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'Makefile'
--- Makefile 2015-03-09 11:16:15 +0000
+++ Makefile 2015-09-30 18:26:14 +0000
@@ -34,7 +34,7 @@
34 touch $(NOSE)34 touch $(NOSE)
3535
36$(CHARMTOOLS): $(VIRTUALENV)36$(CHARMTOOLS): $(VIRTUALENV)
37 @$(PIP) install charm-tools37 @$(PIP) install charm-tools simplejson
38 touch $(CHARMTOOLS)38 touch $(CHARMTOOLS)
3939
40$(AMULET): $(VIRTUALENV)40$(AMULET): $(VIRTUALENV)
4141
=== modified file 'hooks/hooks.py'
--- hooks/hooks.py 2015-07-21 09:11:25 +0000
+++ hooks/hooks.py 2015-09-30 18:26:14 +0000
@@ -24,7 +24,6 @@
24 executed.24 executed.
25 """25 """
26 charmhelpers.payload.execd.execd_preinstall()26 charmhelpers.payload.execd.execd_preinstall()
27 config = charmhelpers.core.hookenv.config()
28 charmhelpers.contrib.ansible.install_ansible_support(27 charmhelpers.contrib.ansible.install_ansible_support(
29 from_ppa=False)28 from_ppa=False)
3029
3130
=== modified file 'playbook.yaml'
--- playbook.yaml 2015-09-26 21:41:07 +0000
+++ playbook.yaml 2015-09-30 18:26:14 +0000
@@ -78,9 +78,16 @@
78 dest: "{{ config_path }}"78 dest: "{{ config_path }}"
79 owner: "{{ user }}"79 owner: "{{ user }}"
80 group: "{{ group }}"80 group: "{{ group }}"
81 mode: 060081 mode: 0640
82 when: not (path_provided | bool) and (config_provided | bool)82 when: not (path_provided | bool) and (config_provided | bool)
8383
84 - name: ensure group can read the config when config_path provided
85 tags:
86 - config-changed
87 - conn-check-relation-changed
88 file: path={{ config_path }} mode=0640 group={{ group }}
89 when: (path_provided | bool) and not (config_provided | bool)
90
84 # We only need user/group for the run-check action, as the Nagios user executes checks above91 # We only need user/group for the run-check action, as the Nagios user executes checks above
85 - name: create group92 - name: create group
86 tags:93 tags:

Subscribers

People subscribed via source and target branches

to all changes: