diff --git a/tasks/ceilometer_db_setup.yml b/tasks/ceilometer_db_setup.yml
new file mode 100644
index 00000000..75be4afb
--- /dev/null
+++ b/tasks/ceilometer_db_setup.yml
@@ -0,0 +1,13 @@
+---
+
+- name: check for gnocchi resource file
+  stat:
+    path: "/etc/ceilometer/gnocchi_resources.yaml"
+  register: gnocchi_resource_file
+
+- name: Initialize Gnocchi database by creating ceilometer resources
+  command: "{{ ceilometer_bin }}/ceilometer-upgrade --skip-metering-database"
+  become: yes
+  become_user: "{{ ceilometer_system_user_name }}"
+  changed_when: false
+  when: gnocchi_resource_file.stat.exists
diff --git a/tasks/main.yml b/tasks/main.yml
index 14f38068..f83ba2fa 100644
--- a/tasks/main.yml
+++ b/tasks/main.yml
@@ -53,3 +53,8 @@
     - groups['ceilometer_central_container'] is defined and inventory_hostname == groups['ceilometer_central_container'][0]
   tags:
     - ceilometer-config
+
+- include: ceilometer_db_setup.yml
+  tags:
+    - ceilometer-config
+  run_once: true