Merge lp:~billy-olsen/charms/trusty/ceilometer/backport-1541618 into lp:charms/ceilometer

[Billy Olsen]

This is a backport of LP 1541618 from Next into Stable.

[Edward Hope-Morley (hopem)]

Hi Billy, can you please resubmit to the git repos instead as we have now moved all stable branches there too. Thanks!

ref: https://github.com/openstack-charmers/openstack-community/blob/master/README.dev-charms.md#stable-charm-updates

review: Disapprove

Unmerged revisions

114. By Billy Olsen on 2016-03-14

[billy-olsen,r=] Use peer_retrieve instead of relation_get when fetching
shared secrets from other nodes (leader node).

The secret sharing previously worked because it used the peer storage
prior to leadership election due to the direct usage of relation_get
rather than using the retrieval methods provided by the peer storage
framework.

Closes Bug: LP #1541618

113. By James Page on 2016-01-19

Fix liberty/mitaka typo from previous test definition update batch.

112. By Liam Young on 2016-01-12

Update test combo definitions, remove Vivid deprecated release tests, update bundletester testplan yaml, update tests README.

111. By Liam Young on 2016-01-08

[corey.bryant, r=gnuoy] Charmhelper sync

110. By Liam Young on 2016-01-08

[corey.bryant, r=gnuoy] Use aodh-notifier and aodh-evaluator starting in Mitaka

In Mitaka, ceilometer-alarm-notifier and ceilometer-alarm-evaluator are
replaced by aodh-notifier and aodh-evaluator

109. By Liam Young on 2016-01-06

[james-page, r=gnuoy] Charmhelper sync

108. By Corey Bryant on 2016-01-04

[corey.bryant,r=trivial] Sync charm-helpers.

107. By James Page on 2015-12-10

Add sane haproxy timeout defaults and make them configurable.

106. By James Page on 2015-11-18

Update maintainer

105. By Corey Bryant on 2015-11-02

[james-pages,r=corey.bryant] Add tox support for lint and unit tests.

=== modified file 'hooks/ceilometer_hooks.py'
--- hooks/ceilometer_hooks.py	2015-10-16 11:59:37 +0000
+++ hooks/ceilometer_hooks.py	2016-03-14 17:18:28 +0000
@@ -57,7 +57,10 @@
     get_hacluster_config,
     is_elected_leader
 )
-from charmhelpers.contrib.peerstorage import peer_store
+from charmhelpers.contrib.peerstorage import (
+    peer_retrieve,
+    peer_store,
+)
 from charmhelpers.payload.execd import execd_preinstall
 
 hooks = Hooks()
@@ -185,7 +188,7 @@
             'cluster-relation-departed')
 @restart_on_change(restart_map(), stopstart=True)
 def cluster_changed():
-    shared_secret = relation_get('shared_secret')
+    shared_secret = peer_retrieve('shared_secret')
     if shared_secret is None or shared_secret.strip() == '':
         log('waiting for shared secret to be provided by leader')
     elif not shared_secret == get_shared_secret():

=== modified file 'unit_tests/test_ceilometer_hooks.py'
--- unit_tests/test_ceilometer_hooks.py	2016-01-06 21:38:19 +0000
+++ unit_tests/test_ceilometer_hooks.py	2016-03-14 17:18:28 +0000
@@ -16,7 +16,6 @@
 TO_PATCH = [
     'relation_get',
     'relation_set',
-    'relation_get',
     'configure_installation_source',
     'openstack_upgrade_available',
     'do_openstack_upgrade',
@@ -33,6 +32,7 @@
     'get_packages',
     'service_restart',
     'update_nrpe_config',
+    'peer_retrieve',
     'peer_store',
     'configure_https',
     'status_set',
@@ -234,7 +234,7 @@
     @patch('charmhelpers.core.hookenv.config')
     @patch.object(hooks, 'set_shared_secret')
     def test_cluster_changed(self, shared_secret, mock_config):
-        self.relation_get.return_value = None
+        self.peer_retrieve.return_value = None
         hooks.hooks.execute(['hooks/cluster-relation-changed'])
         self.assertFalse(shared_secret.called)
 
@@ -243,7 +243,7 @@
     @patch.object(hooks, 'set_shared_secret')
     def test_cluster_changed_new_secret(self, mock_set_secret, mock_get_secret,
                                         mock_config):
-        self.relation_get.return_value = "leader_secret"
+        self.peer_retrieve.return_value = "leader_secret"
         mock_get_secret.return_value = "my_secret"
         hooks.hooks.execute(['hooks/cluster-relation-changed'])
         mock_set_secret.assert_called_with("leader_secret")
@@ -253,7 +253,7 @@
     @patch.object(hooks, 'set_shared_secret')
     def test_cluster_changed_old_secret(self, mock_set_secret, mock_get_secret,
                                         mock_config):
-        self.relation_get.return_value = "leader_secret"
+        self.peer_retrieve.return_value = "leader_secret"
         mock_get_secret.return_value = "leader_secret"
         hooks.hooks.execute(['hooks/cluster-relation-changed'])
         self.assertEquals(mock_set_secret.call_count, 0)