Merge lp:~openstack-charmers/charms/trusty/nova-compute/backport-fix-lp1448143 into lp:~openstack-charmers-archive/charms/trusty/nova-compute/trunk

[Jorge Niedbalski]

Fixes bug LP: #1448143

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

charm_lint_check #3954 nova-compute for niedbalski mp257390
    LINT OK: passed

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

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

charm_unit_test #3741 nova-compute for niedbalski mp257390
    UNIT OK: passed

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

[Billy Olsen (billy-olsen)]

LGTM, Approved - Thanks Jorge!

review: Approve

=== modified file 'hooks/nova_compute_hooks.py'
--- hooks/nova_compute_hooks.py	2015-04-22 09:21:01 +0000
+++ hooks/nova_compute_hooks.py	2015-04-24 13:53:54 +0000
@@ -137,7 +137,8 @@
     for rid in relation_ids('zeromq-configuration'):
         zeromq_configuration_relation_joined(rid)
 
-    update_nrpe_config()
+    if is_relation_made("nrpe-external-master"):
+        update_nrpe_config()
 
     CONFIGS.write_all()
 
@@ -325,7 +326,9 @@
 def upgrade_charm():
     for r_id in relation_ids('amqp'):
         amqp_joined(relation_id=r_id)
-    update_nrpe_config()
+
+    if is_relation_made('nrpe-external-master'):
+        update_nrpe_config()
 
 
 @hooks.hook('nova-ceilometer-relation-changed')

=== modified file 'unit_tests/test_nova_compute_hooks.py'
--- unit_tests/test_nova_compute_hooks.py	2015-04-15 14:21:42 +0000
+++ unit_tests/test_nova_compute_hooks.py	2015-04-24 13:53:54 +0000
@@ -206,6 +206,24 @@
         self.git_install.assert_called_with(projects_yaml)
         self.assertFalse(self.do_openstack_upgrade.called)
 
+    @patch.object(hooks, 'compute_joined')
+    def test_config_changed_no_nrpe(self, compute_joined):
+        self.git_install_requested.return_value = False
+        self.openstack_upgrade_available.return_value = False
+        self.migration_enabled.return_value = False
+        self.is_relation_made.return_value = False
+        hooks.config_changed()
+        self.assertFalse(self.update_nrpe_config.called)
+
+    @patch.object(hooks, 'compute_joined')
+    def test_config_changed_nrpe(self, compute_joined):
+        self.git_install_requested.return_value = False
+        self.openstack_upgrade_available.return_value = False
+        self.migration_enabled.return_value = False
+        self.is_relation_made.return_value = True
+        hooks.config_changed()
+        self.update_nrpe_config.assert_called_once()
+
     def test_amqp_joined(self):
         hooks.amqp_joined()
         self.relation_set.assert_called_with(