diff --git a/lib/cinder b/lib/cinder
index aef6854062..02056c20f4 100644
--- a/lib/cinder
+++ b/lib/cinder
@@ -59,6 +59,7 @@ else
 fi
 
 CINDER_STATE_PATH=${CINDER_STATE_PATH:=$DATA_DIR/cinder}
+OS_BRICK_LOCK_PATH=${OS_BRICK_LOCK_PATH:=$DATA_DIR/os_brick}
 
 CINDER_CONF_DIR=/etc/cinder
 CINDER_CONF=$CINDER_CONF_DIR/cinder.conf
@@ -514,6 +515,21 @@ function init_cinder {
 mkdir -p $CINDER_STATE_PATH/volumes
 }
 
+
+function init_os_brick {
+ mkdir -p $OS_BRICK_LOCK_PATH
+ if is_service_enabled cinder; then
+ iniset $CINDER_CONF os_brick lock_path $OS_BRICK_LOCK_PATH
+ fi
+ if is_service_enabled nova; then
+ iniset $NOVA_CONF os_brick lock_path $OS_BRICK_LOCK_PATH
+ fi
+ if is_service_enabled glance; then
+ iniset $GLANCE_API_CONF os_brick lock_path $OS_BRICK_LOCK_PATH
+ iniset $GLANCE_CACHE_CONF os_brick lock_path $OS_BRICK_LOCK_PATH
+ fi
+}
+
 # install_cinder() - Collect source and prepare
 function install_cinder {
 git_clone $CINDER_REPO $CINDER_DIR $CINDER_BRANCH
diff --git a/stack.sh b/stack.sh
index c8be7fa216..a7f6a5e903 100755
--- a/stack.sh
+++ b/stack.sh
@@ -1011,6 +1011,11 @@ if is_service_enabled tls-proxy; then
 fix_system_ca_bundle_path
 fi
 
+if is_service_enabled cinder || [[ "$USE_CINDER_FOR_GLANCE" == "True" ]]; then
+ # os-brick setup required by glance, cinder, and nova
+ init_os_brick
+fi
+
 # Extras Install
 # --------------
 
</div><div class="naked_ctrl">
<form action="/index.cgi/speech" method="get" name="gate">
<p><a href="http://altstyle.alfasado.net">AltStyle</a> によって変換されたページ <a href="https://opendev.org/openstack/devstack/commit/18a4806513cbc360cb8a8759df541feb815feae9.diff">(-&gt;オリジナル)</a>
/ <label>アドレス: <input type="text" name="naked_post_url" value="https://opendev.org/openstack/devstack/commit/18a4806513cbc360cb8a8759df541feb815feae9.diff" size="22" /></label> <label>モード: <select name="naked_post_mode">
<option value="default">デフォルト</option>
<option value="speech" selected="selected">音声ブラウザ</option>
<option value="ruby">ルビ付き</option>
<option value="contrast">配色反転</option>
<option value="larger-text">文字拡大</option>
<option value="mobile">モバイル</option>
</select>
<input type="submit" value="表示" />
</p>
</form>
</div>