diff --git a/metadata/service/compute/cluster.yml b/metadata/service/compute/cluster.yml
index ba85fbd..9e6e485 100644
--- a/metadata/service/compute/cluster.yml
+++ b/metadata/service/compute/cluster.yml
@@ -7,6 +7,7 @@
     openstack_log_appender: false
     openstack_fluentd_handler_enabled: false
     openstack_ossyslog_handler_enabled: false
+    nova_rpc_response_timeout: 30
   nova:
     compute:
       version: ${_param:nova_version}
@@ -44,6 +45,7 @@
       message_queue:
         engine: rabbitmq
         port: 5672
+        rpc_response_timeout: ${_param:nova_rpc_response_timeout}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/metadata/service/compute/ironic.yml b/metadata/service/compute/ironic.yml
index 5428d44..e81933b 100644
--- a/metadata/service/compute/ironic.yml
+++ b/metadata/service/compute/ironic.yml
@@ -7,6 +7,7 @@
     openstack_log_appender: false
     openstack_fluentd_handler_enabled: false
     openstack_ossyslog_handler_enabled: false
+    nova_rpc_response_timeout: 30
   nova:
     compute:
       version: ${_param:nova_version}
@@ -44,6 +45,7 @@
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
         port: 5672
+        rpc_response_timeout: ${_param:nova_rpc_response_timeout}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/metadata/service/compute/kvm.yml b/metadata/service/compute/kvm.yml
index 2ede8af..0a1925b 100644
--- a/metadata/service/compute/kvm.yml
+++ b/metadata/service/compute/kvm.yml
@@ -7,6 +7,7 @@
     openstack_log_appender: false
     openstack_fluentd_handler_enabled: false
     openstack_ossyslog_handler_enabled: false
+    nova_rpc_response_timeout: 30
   nova:
     compute:
       version: ${_param:nova_version}
@@ -45,6 +46,7 @@
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
         port: 5672
+        rpc_response_timeout: ${_param:nova_rpc_response_timeout}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/metadata/service/control/cluster.yml b/metadata/service/control/cluster.yml
index 03daebc..2e17d93 100644
--- a/metadata/service/control/cluster.yml
+++ b/metadata/service/control/cluster.yml
@@ -9,6 +9,7 @@
     openstack_log_appender: false
     openstack_fluentd_handler_enabled: false
     openstack_ossyslog_handler_enabled: false
+    nova_rpc_response_timeout: 30
   nova:
     controller:
       enabled: true
@@ -55,6 +56,7 @@
         engine: rabbitmq
         host: ${_param:cluster_vip_address}
         port: 5672
+        rpc_response_timeout: ${_param:nova_rpc_response_timeout}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'
diff --git a/metadata/service/control/single.yml b/metadata/service/control/single.yml
index 9cdbacb..c525974 100644
--- a/metadata/service/control/single.yml
+++ b/metadata/service/control/single.yml
@@ -9,6 +9,7 @@
     openstack_log_appender: false
     openstack_fluentd_handler_enabled: false
     openstack_ossyslog_handler_enabled: false
+    nova_rpc_response_timeout: 30
   nova:
     controller:
       enabled: true
@@ -55,6 +56,7 @@
         engine: rabbitmq
         host: ${_param:single_address}
         port: 5672
+        rpc_response_timeout: ${_param:nova_rpc_response_timeout}
         user: openstack
         password: ${_param:rabbitmq_openstack_password}
         virtual_host: '/openstack'