diff --git a/bundles/ceilometer/hooks/ceilometer_hooks.py b/bundles/ceilometer/hooks/ceilometer_hooks.py
index cfc20d792881f97cd06cc10c04797ee9d210d660..9c013e1d30565ea8282939518c44b584db8a227e 100755
--- a/bundles/ceilometer/hooks/ceilometer_hooks.py
+++ b/bundles/ceilometer/hooks/ceilometer_hooks.py
@@ -444,6 +444,16 @@ def update_status():
     log('Updating status.')
 
 
+# TODO. Attardi
+@hooks.hook('gnocchi-available')
+def gnocchi_available():
+    """Create Ceilometer resources in Gnocchi. Gnocchi should be running by this stage:
+    ceilometer-upgrade --skip-metering-database
+    """
+    from ceilometer import gnocchi_client
+    gnocchi_client.upgrade_resource_types() #(conf)
+
+
 if __name__ == '__main__':
     try:
         hooks.execute(sys.argv)