diff --git a/defaults/main.yml b/defaults/main.yml
index 9ae6a6c8..1593d45a 100644
--- a/defaults/main.yml
+++ b/defaults/main.yml
@@ -151,6 +151,14 @@ swift_object_disable_fallocate: "{{ swift_disable_fallocate }}"
 ## Swift ceilometer variables
 swift_reselleradmin_role: ResellerAdmin
 
+# Swift ceilometer rabbitmq settings
+swift_rabbitmq_telemetry_userid: "swift"
+swift_rabbitmq_telemetry_vhost: "/swift"
+swift_rabbitmq_telemetry_port: "5672"
+swift_rabbitmq_telemetry_servers: "127.0.0.1"
+# For now swift ceilometer does not work with SSL - this is a speculative option in the hope it gets added
+swift_rabbitmq_telemetry_use_ssl: "False"
+
 swift_account_server_program_config_options: /etc/swift/account-server/account-server.conf
 swift_account_replicator_program_config_options: /etc/swift/account-server/account-server-replicator.conf
 
diff --git a/templates/proxy-server.conf.j2 b/templates/proxy-server.conf.j2
index 4ffa77fe..747581dc 100644
--- a/templates/proxy-server.conf.j2
+++ b/templates/proxy-server.conf.j2
@@ -187,7 +187,7 @@ use = egg:swift#xprofile
 paste.filter_factory = ceilometermiddleware.swift:filter_factory
 control_exchange = swift
 driver = messagingv2
-url = rabbit://{{ ceilometer_rabbitmq_userid }}:{{ ceilometer_rabbitmq_password }}@{{ hostvars[groups[ceilometer_rabbitmq_host_group][0]]['ansible_ssh_host'] }}:{{ ceilometer_rabbitmq_port }}/{{ ceilometer_rabbitmq_vhost }}
+url = rabbit://{% for host in swift_rabbitmq_telemetry_servers.split(',') %}{{ swift_rabbitmq_telemetry_userid }}:{{ swift_rabbitmq_telemetry_password }}@{{ host }}:{{ swift_rabbitmq_telemetry_port }}{% if not loop.last %},{% else %}/{{ swift_rabbitmq_telemetry_vhost }}{% endif %}{% endfor %}
 topic = notifications
 log_level = WARN
 {% endif %}