diff --git a/.gitignore b/.gitignore
index 80007cf..34a9602 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,4 @@ tags
 *.pyc
 .unit-state.db
 trusty
+.stestr
diff --git a/hooks/ceilometer_contexts.py b/hooks/ceilometer_contexts.py
index bdd4066..ec88fc8 100644
--- a/hooks/ceilometer_contexts.py
+++ b/hooks/ceilometer_contexts.py
@@ -53,7 +53,8 @@ class CeilometerServiceContext(OSContextGenerator):
 
     optional_keys = [
         'rabbit_ssl_port',
-        'rabbit_ssl_ca'
+        'rabbit_ssl_ca',
+        'rabbitmq_hosts'
     ]
 
     def __init__(self, ssl_dir=None):
diff --git a/unit_tests/test_ceilometer_contexts.py b/unit_tests/test_ceilometer_contexts.py
index 1a4e51c..4bef1c4 100644
--- a/unit_tests/test_ceilometer_contexts.py
+++ b/unit_tests/test_ceilometer_contexts.py
@@ -38,6 +38,7 @@ class CeilometerContextsTest(CharmTestCase):
             'debug': True,
             'verbose': False,
             'rabbitmq_host': 'foo',
+            'rabbitmq_hosts': 'foo,bar',
             'rabbitmq_user': 'bar',
             'rabbitmq_password': 'baz',
             'rabbitmq_virtual_host': 'openstack',