Merge lp:~niedbalski/charms/trusty/ceilometer-agent/backport-fix-lp1444015 into lp:~openstack-charmers-archive/charms/trusty/ceilometer-agent/trunk

[Jorge Niedbalski]

Trusty backport for LP:# 1444015

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

charm_lint_check #3335 ceilometer-agent for niedbalski mp256232
    LINT OK: passed

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

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

charm_unit_test #3123 ceilometer-agent for niedbalski mp256232
    UNIT OK: passed

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

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

charm_amulet_test #3159 ceilometer-agent for niedbalski mp256232
    AMULET FAIL: amulet-test missing

AMULET Results (max last 2 lines):
INFO:root:Search string not found in makefile target commands.
ERROR:root:No make target was executed.

Full amulet test output: http://paste.ubuntu.com/10824043/
Build: http://10.245.162.77:8080/job/charm_amulet_test/3159/

[Billy Olsen (billy-olsen)]

Approved

review: Approve

=== modified file 'hooks/ceilometer_hooks.py'
--- hooks/ceilometer_hooks.py	2015-01-26 08:00:21 +0000
+++ hooks/ceilometer_hooks.py	2015-04-14 21:29:04 +0000
@@ -10,6 +10,7 @@
     config,
     Hooks, UnregisteredHookError,
     log,
+    is_relation_made,
     relation_set,
 )
 from charmhelpers.core.host import (
@@ -57,7 +58,8 @@
 @restart_on_change(restart_map())
 def ceilometer_changed():
     CONFIGS.write_all()
-    update_nrpe_config()
+    if is_relation_made('nrpe-external-master'):
+        update_nrpe_config()
 
 
 @hooks.hook('config-changed')
@@ -65,7 +67,8 @@
 def config_changed():
     if openstack_upgrade_available('ceilometer-common'):
         do_openstack_upgrade(CONFIGS)
-    update_nrpe_config()
+    if is_relation_made('nrpe-external-master'):
+        update_nrpe_config()
     CONFIGS.write_all()
 
 

=== modified file 'hooks/charmhelpers/__init__.pyc'
Binary files hooks/charmhelpers/__init__.pyc	2015-01-26 08:00:21 +0000 and hooks/charmhelpers/__init__.pyc	2015-04-14 21:29:04 +0000 differ
=== modified file 'unit_tests/test_ceilometer_hooks.py'
--- unit_tests/test_ceilometer_hooks.py	2015-01-26 08:00:21 +0000
+++ unit_tests/test_ceilometer_hooks.py	2015-04-14 21:29:04 +0000
@@ -24,6 +24,7 @@
     'openstack_upgrade_available',
     'do_openstack_upgrade',
     'update_nrpe_config',
+    'is_relation_made',
 ]
 
 
@@ -57,10 +58,19 @@
         self.assertTrue(self.update_nrpe_config.called)
 
     @patch('charmhelpers.core.hookenv.config')
+    def test_ceilometer_changed_no_nrpe(self, mock_config):
+        self.is_relation_made.return_value = False
+
+        hooks.hooks.execute(['hooks/ceilometer-service-relation-changed'])
+        self.assertTrue(self.CONFIGS.write_all.called)
+        self.assertFalse(self.update_nrpe_config.called)
+
+    @patch('charmhelpers.core.hookenv.config')
     def test_nova_ceilometer_joined(self, mock_config):
         hooks.hooks.execute(['hooks/nova-ceilometer-relation-joined'])
         self.relation_set.assert_called_with(
-            subordinate_configuration=json.dumps(ceilometer_utils.NOVA_SETTINGS))
+            subordinate_configuration=json.dumps(
+                ceilometer_utils.NOVA_SETTINGS))
 
     @patch('charmhelpers.core.hookenv.config')
     def test_config_changed_no_upgrade(self, mock_config):
@@ -81,3 +91,15 @@
         self.assertTrue(self.do_openstack_upgrade.called)
         self.assertTrue(self.CONFIGS.write_all.called)
         self.assertTrue(self.update_nrpe_config.called)
+
+    @patch('charmhelpers.core.hookenv.config')
+    def test_config_changed_no_nrpe(self, mock_config):
+        self.openstack_upgrade_available.return_value = False
+        self.is_relation_made.return_value = False
+
+        hooks.hooks.execute(['hooks/config-changed'])
+        self.openstack_upgrade_available.\
+            assert_called_with('ceilometer-common')
+        self.assertFalse(self.do_openstack_upgrade.called)
+        self.assertTrue(self.CONFIGS.write_all.called)
+        self.assertFalse(self.update_nrpe_config.called)