Merge lp:~jillrouleau/charms/trusty/percona-cluster/add-n-e-m-interface into lp:~openstack-charmers-archive/charms/trusty/percona-cluster/next

[Jill Rouleau]

Add missing n-e-m interface, config-changed so hooks will run.

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #9775 percona-cluster-next for jillrouleau mp270874
    LINT FAIL: lint-test failed

LINT Results (max last 2 lines):
make: *** [lint] Error 1
ERROR:root:Make target returned non-zero.

Full lint test output: http://paste.ubuntu.com/12351174/
Build: http://10.245.162.77:8080/job/charm_lint_check/9775/

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9003 percona-cluster-next for jillrouleau mp270874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9003/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6357 percona-cluster-next for jillrouleau mp270874
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6357/

[Billy Olsen (billy-olsen)]

Minor nit - can you fix the lint error? Looks like too much whitespace (extra blank line) after the TO_PATCH array in unit_test/test_percona_hooks.py

review: Needs Fixing

[lp:~jillrouleau/charms/trusty/percona-cluster/add-n-e-m-interface]

74. By Jill Rouleau on 2015-09-15

[jillr] remove extraneous newline

[uosci-testing-bot (uosci-testing-bot)]

charm_unit_test #9233 percona-cluster-next for jillrouleau mp270874
    UNIT OK: passed

Build: http://10.245.162.77:8080/job/charm_unit_test/9233/

[uosci-testing-bot (uosci-testing-bot)]

charm_lint_check #10067 percona-cluster-next for jillrouleau mp270874
    LINT OK: passed

Build: http://10.245.162.77:8080/job/charm_lint_check/10067/

[uosci-testing-bot (uosci-testing-bot)]

charm_amulet_test #6453 percona-cluster-next for jillrouleau mp270874
    AMULET OK: passed

Build: http://10.245.162.77:8080/job/charm_amulet_test/6453/

[Billy Olsen (billy-olsen)]

Thanks Jill, this looks good to me! Approved

review: Approve

=== modified file 'hooks/percona_hooks.py'
--- hooks/percona_hooks.py	2015-07-30 10:39:19 +0000
+++ hooks/percona_hooks.py	2015-09-15 23:55:51 +0000
@@ -278,6 +278,9 @@
         # make sure all the HA resources are (re)created
         ha_relation_joined()
 
+    if is_relation_made('nrpe-external-master'):
+        update_nrpe_config()
+
 
 @hooks.hook('cluster-relation-joined')
 def cluster_joined():

=== modified file 'metadata.yaml'
--- metadata.yaml	2015-08-26 13:10:35 +0000
+++ metadata.yaml	2015-09-15 23:55:51 +0000
@@ -14,6 +14,9 @@
     interface: mysql-root
   shared-db:
     interface: mysql-shared
+  nrpe-external-master:
+    interface: nrpe-external-master
+    scope: container
 peers:
   cluster:
     interface: percona-cluster

=== modified file 'unit_tests/test_percona_hooks.py'
--- unit_tests/test_percona_hooks.py	2015-08-26 13:22:41 +0000
+++ unit_tests/test_percona_hooks.py	2015-09-15 23:55:51 +0000
@@ -8,7 +8,8 @@
 TO_PATCH = ['log', 'config',
             'get_db_helper',
             'relation_ids',
-            'relation_set']
+            'relation_set',
+            'update_nrpe_config']
 
 
 class TestHaRelation(CharmTestCase):