diff --git a/ceilometer/agent/cluster.yml b/ceilometer/agent/cluster.yml
index 769ff68..9f7b62f 100644
--- a/ceilometer/agent/cluster.yml
+++ b/ceilometer/agent/cluster.yml
@@ -1,6 +1,8 @@
 classes:
 - service.ceilometer.agent.cluster
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     agent:
       region: ${_param:openstack_region}
@@ -17,6 +19,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
         members:
           - host: ${_param:openstack_message_queue_node01_address}
diff --git a/ceilometer/agent/single.yml b/ceilometer/agent/single.yml
index 0b0bbc3..cfcb855 100644
--- a/ceilometer/agent/single.yml
+++ b/ceilometer/agent/single.yml
@@ -1,7 +1,11 @@
 classes:
 - service.ceilometer.agent.single
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     agent:
+      message_queue:
+        port: ${_param:openstack_rabbitmq_port}
       identity:
         protocol: ${_param:internal_protocol}
diff --git a/ceilometer/agent/telemetry/cluster.yml b/ceilometer/agent/telemetry/cluster.yml
index b761fd0..99e1090 100644
--- a/ceilometer/agent/telemetry/cluster.yml
+++ b/ceilometer/agent/telemetry/cluster.yml
@@ -1,6 +1,8 @@
 classes:
 - service.ceilometer.agent.cluster.common
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     agent:
       region: ${_param:openstack_region}
@@ -17,6 +19,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
         members:
           - host: ${_param:openstack_message_queue_node01_address}
diff --git a/ceilometer/agent/telemetry/single.yml b/ceilometer/agent/telemetry/single.yml
index 93a4c27..a5ce009 100644
--- a/ceilometer/agent/telemetry/single.yml
+++ b/ceilometer/agent/telemetry/single.yml
@@ -1,7 +1,11 @@
 classes:
 - service.ceilometer.agent.single.common
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     agent:
+      message_queue:
+        port: ${_param:openstack_rabbitmq_port}
       identity:
         protocol: ${_param:internal_protocol}
diff --git a/ceilometer/server/cluster.yml b/ceilometer/server/cluster.yml
index 4a24dda..f5aea52 100644
--- a/ceilometer/server/cluster.yml
+++ b/ceilometer/server/cluster.yml
@@ -5,6 +5,8 @@
 - system.haproxy.proxy.listen.openstack.ceilometer
 - system.keepalived.cluster.instance.openstack_telemetry_vip
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     server:
       enabled: true
@@ -32,6 +34,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
         members:
           - host: ${_param:openstack_message_queue_node01_address}
diff --git a/ceilometer/server/single.yml b/ceilometer/server/single.yml
index 5f56244..505f0c0 100644
--- a/ceilometer/server/single.yml
+++ b/ceilometer/server/single.yml
@@ -1,8 +1,12 @@
 classes:
 - service.ceilometer.server.single
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     server:
+      message_queue:
+        port: ${_param:openstack_rabbitmq_port}
       role: ${_param:openstack_node_role}
       database:
         influxdb:
diff --git a/ceilometer/server/telemetry/cluster.yml b/ceilometer/server/telemetry/cluster.yml
index 9a361eb..97070dc 100644
--- a/ceilometer/server/telemetry/cluster.yml
+++ b/ceilometer/server/telemetry/cluster.yml
@@ -3,6 +3,8 @@
 - service.ceilometer.server.cluster.common
 - system.keepalived.cluster.instance.openstack_telemetry_vip
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     server:
       enabled: true
@@ -28,6 +30,7 @@
         region: ${_param:openstack_region}
         protocol: ${_param:cluster_internal_protocol}
       message_queue:
+        port: ${_param:openstack_rabbitmq_port}
         engine: rabbitmq
         members:
           - host: ${_param:openstack_message_queue_node01_address}
diff --git a/ceilometer/server/telemetry/single.yml b/ceilometer/server/telemetry/single.yml
index 8dfb277..fbe7ac7 100644
--- a/ceilometer/server/telemetry/single.yml
+++ b/ceilometer/server/telemetry/single.yml
@@ -1,8 +1,12 @@
 classes:
 - service.ceilometer.server.single.common
 parameters:
+  _param:
+    openstack_rabbitmq_port: 5672
   ceilometer:
     server:
+      message_queue:
+        port: ${_param:openstack_rabbitmq_port}
       role: ${_param:openstack_node_role}
       identity:
         protocol: ${_param:internal_protocol}