diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 30fd4f5eab..4675ce2cf5 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -286,6 +286,7 @@ function configure_trove {
 
     # Use these values only if they're set
     iniset_conditional $TROVE_GUESTAGENT_CONF DEFAULT state_change_wait_time $TROVE_STATE_CHANGE_WAIT_TIME
+    iniset_conditional $TROVE_COMMAND_PROCESS_TIMEOUT DEFAULT command_process_timeout $TROVE_COMMAND_PROCESS_TIMEOUT
 
     # Set up Guest Agent conf
     iniset $TROVE_GUESTAGENT_CONF DEFAULT rpc_backend "rabbit"
diff --git a/devstack/settings b/devstack/settings
index 9d926c6d96..45cd862c30 100644
--- a/devstack/settings
+++ b/devstack/settings
@@ -39,6 +39,7 @@ TROVE_AGENT_CALL_HIGH_TIMEOUT=${TROVE_AGENT_CALL_HIGH_TIMEOUT:-1200}
 TROVE_RESIZE_TIME_OUT=${TROVE_RESIZE_TIME_OUT}
 TROVE_USAGE_TIMEOUT=${TROVE_USAGE_TIMEOUT}
 TROVE_STATE_CHANGE_WAIT_TIME=${TROVE_STATE_CHANGE_WAIT_TIME}
+TROVE_COMMAND_PROCESS_TIMEOUT=${TROVE_COMMAND_PROCESS_TIMEOUT:-60}
 
 # Set up the host gateway
 if is_service_enabled neutron; then