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'