Merge lp:~zhhuabj/charm-helpers/lp1685788 into lp:charm-helpers

[Hua Zhang]

[Alex Kavanagh (ajkavanagh)]

This is going to need more of a commit/merge message please. Why are these being added? The bug report has more information, but it would be very useful to future readers of the commit history of charm-helpers why these were added here. It's also not clear which context class this is being added to. Thanks.

review: Needs Fixing

[lp:~zhhuabj/charm-helpers/lp1685788]

758. By Hua Zhang on 2017-07-05

When the OpenStack clouds get bigger, more messaging transactions will happen,
which will cause more load on rabbitmq server. In order to mitigate this,
polling_interval rpc_response_timeout and report_interval values are important
to adjust accordingly to the size of OpenStack cluster.

So this patch supports setting those values in neutron-api centrally, then:

1, polling_interval
   neutron-openvswitch charm gets polling_interval via it's relations and set it
   in [agent] of ml2_conf.ini or openvswitch_agent.ini(>=Mitaka)

2, rpc_response_timeout
   neutron-gateway charm gets rpc_response_timeout via it's relations and set it
   in [default] of neutron.conf

3, report_interval
   Both neutron-openvswitch charm and neutron-gateway charm get report_interval
   via it's relations and set it in [agent] of neutron.conf

Thus we need to modifty charm-helpers to set those values in NeutronAPIContext,
too.

[Hua Zhang (zhhuabj)]

Hi Alex, I have updated commit/merge message, thanks for the review.

[Alex Kavanagh (ajkavanagh)]

The commit message now looks great. Thanks for fixing it up.

review: Approve

=== modified file 'charmhelpers/contrib/openstack/context.py'
--- charmhelpers/contrib/openstack/context.py	2017-05-01 05:08:50 +0000
+++ charmhelpers/contrib/openstack/context.py	2017-07-05 10:39:18 +0000
@@ -1397,6 +1397,18 @@
                 'rel_key': 'dns-domain',
                 'default': None,
             },
+            'polling_interval': {
+                'rel_key': 'polling-interval',
+                'default': 2,
+            },
+            'rpc_response_timeout': {
+                'rel_key': 'rpc-response-timeout',
+                'default': 60,
+            },
+            'report_interval': {
+                'rel_key': 'report-interval',
+                'default': 30,
+            },
         }
         ctxt = self.get_neutron_options({})
         for rid in relation_ids('neutron-plugin-api'):

=== modified file 'tests/contrib/openstack/test_os_contexts.py'
--- tests/contrib/openstack/test_os_contexts.py	2017-04-26 09:29:19 +0000
+++ tests/contrib/openstack/test_os_contexts.py	2017-07-05 10:39:18 +0000
@@ -3117,6 +3117,9 @@
         api_ctxt = context.NeutronAPIContext()()
         for key in expected_keys:
             self.assertTrue(key in api_ctxt)
+        self.assertEquals(api_ctxt['polling_interval'], 2)
+        self.assertEquals(api_ctxt['rpc_response_timeout'], 60)
+        self.assertEquals(api_ctxt['report_interval'], 30)
 
     def test_neutronapicontext_string_converted(self):
         self.relation_ids.return_value = ['neutron-plugin-api:1']