diff --git a/bundles/openstack/bundle_template.juju2.yaml b/bundles/openstack/bundle_template.juju2.yaml
index dae712a389fa06c2bce5d4bac8457ea71843a8ea..5cdf9c54ef69614e750832a06b94b0b351c07013 100644
--- a/bundles/openstack/bundle_template.juju2.yaml
+++ b/bundles/openstack/bundle_template.juju2.yaml
@@ -784,6 +784,36 @@ services:
       gui-x: '0'
       gui-y: '1100'
 
+ceilometer:
+    charm: cs:ceilometer
+    series: xenial
+    num_units: 1
+    bindings:
+      public: *network_space_pub
+      admin: *network_space_os_mgmt
+      internal: *network_space_os_mgmt
+    options:
+      action-managed-upgrade: True
+      debug: False
+      verbose: False
+      event-time-to-live: *celiometer_event_time_to_live
+      metering-time-to-live: *celiometer_metering_time_to_live
+      region: *region
+    to:
+      - 'lxd:1'
+    annotations:
+      gui-x: '450'
+      gui-y: '-250'
+
+  ceilometer-agent:
+    charm: cs:ceilometer-agent-238
+    series: xenial
+    options:
+      action-managed-upgrade: True
+    annotations:
+      gui-x: '200'
+      gui-y: '-150'
+
 # ------------------------------------------------------------------------------
 relations:
   - [ ntp, ctrl-host ]
@@ -890,3 +920,12 @@ relations:
 # nagios rabbitmq
   - [rabbitmq-server, nrpe-rabbitmq]
   - [ "nrpe-rabbitmq:monitors", "nagios-server:monitors" ]
+# ceilometer
+  - [ "ceilometer:amqp", "rabbitmq-server:amqp" ]
+  - [ "ceilometer:identity-service", "keystone:identity-service" ]
+  - [ "ceilometer:identity-notifications", "keystone:identity-notifications" ]
+  - [ "ceilometer-agent:nova-ceilometer", "nova-compute:nova-ceilometer" ]
+  - [ "ceilometer:ceilometer-service", "ceilometer-agent:ceilometer-service" ]
+  - [ "ceilometer:juju-info", "defaultgw:juju-info" ]
+
+