diff --git a/lib/keystone b/lib/keystone
index fd1d1d4..0d54dee 100644
--- a/lib/keystone
+++ b/lib/keystone
@@ -488,8 +488,10 @@
         init_ldap
     fi
 
-    # (Re)create keystone database
-    recreate_database keystone
+    if [[ "$RECREATE_KEYSTONE_DB" == True ]]; then
+        # (Re)create keystone database
+        recreate_database keystone
+    fi
 
     # Initialize keystone database
     $KEYSTONE_BIN_DIR/keystone-manage --config-file $KEYSTONE_CONF db_sync