Make use of default `config.rendered` handler

Change-Id: I32a01267e065e8535c4b3f2202b071f2f0193437

src/lib/charm/openstack/gnocchi.py

@@ -149,16 +149,6 @@ class GnochiCharmBase(charms_openstack.charm.HAOpenStackCharm,
             'username': 'gnocchi',
             'hostname': ch_ip.get_relation_ip(DB_INTERFACE)}, ]
 
-    def disable_services(self):
-        '''Disable all services related to gnocchi'''
-        for svc in self.services:
-            host.service_pause(svc)
-
-    def enable_services(self):
-        '''Enable all services related to gnocchi'''
-        for svc in self.services:
-            host.service_resume(svc)
-
     @property
     def gnocchi_user(self):
         '''Determine user gnocchi processes will run as

src/reactive/gnocchi_handlers.py

@@ -24,6 +24,7 @@ charm.use_defaults(
     'shared-db.connected',
     'identity-service.connected',
     'config.changed',
+    'config.rendered',
     'update-status',
     'certificates.available',
 )
@@ -34,12 +35,6 @@ required_interfaces = ['coordinator-memcached.available',
                        'storage-ceph.pools.available']
 
 
-@reactive.when_not_all(*required_interfaces)
-def disable_services():
-    with charm.provide_charm_instance() as charm_class:
-        charm_class.disable_services()
-
-
 @reactive.when(*required_interfaces)
 def render_config(*args):
     """Render the configuration for charm when all the interfaces are
@@ -48,10 +43,8 @@ def render_config(*args):
     with charm.provide_charm_instance() as charm_class:
         charm_class.upgrade_if_available(args)
         charm_class.configure_ssl()
-        charm_class.enable_services()
         charm_class.render_with_interfaces(args)
         charm_class.enable_webserver_site()
-        charm_class.assess_status()
     hookenv.log("Configuration rendered", hookenv.DEBUG)
     reactive.set_state('config.rendered')
 

unit_tests/test_gnocchi_handlers.py

@@ -31,6 +31,7 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
             'ha.connected',
             'identity-service.connected',
             'config.changed',
+            'config.rendered',
             'update-status',
             'charm.default-select-release',
             'certificates.available']
@@ -67,9 +68,6 @@ class TestRegisteredHooks(test_utils.TestRegisteredHooks):
                 'storage_ceph_disconnected': (
                     'storage-ceph.connected',
                 ),
-                'disable_services': (
-                    'config.rendered',
-                ),
                 'cluster_connected': (
                     'ha.available',
                 ),
@@ -103,12 +101,13 @@ class TestHandlers(test_utils.PatchHelper):
         self.provide_charm_instance().__exit__.return_value = None
 
     def test_render_stuff(self):
+        self.patch_object(handlers.reactive, 'set_state')
         handlers.render_config('arg1', 'arg2')
         self.gnocchi_charm.render_with_interfaces.assert_called_once_with(
             ('arg1', 'arg2')
         )
-        self.gnocchi_charm.assess_status.assert_called_once_with()
         self.gnocchi_charm.enable_webserver_site.assert_called_once_with()
+        self.set_state.assert_called_once_with('config.rendered')
 
     def test_init_db(self):
         handlers.init_db()