openstack/devstack
Code Issues Proposed changes

Merge "link /etc/tgt/stack.d to cinder volumes directory"

Browse Source
This commit is contained in:
Jenkins 2013-04-15 13:20:28 +00:00 committed by Gerrit Code Review
commit 3927fa76d2
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
lib/cinder
View File

@ -377,21 +377,20 @@ function install_cinderclient() {
setup_develop $CINDERCLIENT_DIR setup_develop $CINDERCLIENT_DIR
} }
# apply config.d approach (e.g. Oneiric does not have this) # apply config.d approach for cinder volumes directory
function _configure_tgt_for_config_d() { function _configure_tgt_for_config_d() {
if [[ ! -d /etc/tgt/conf.d/ ]]; then if [[ ! -d /etc/tgt/stack.d/ ]]; then
sudo mkdir -p /etc/tgt/conf.d sudo ln -sf $CINDER_STATE_PATH/volumes /etc/tgt/stack.d
echo "include /etc/tgt/conf.d/*.conf" | sudo tee -a /etc/tgt/targets.conf echo "include /etc/tgt/stack.d/*" | sudo tee -a /etc/tgt/targets.conf
fi fi
} }
# start_cinder() - Start running processes, including screen # start_cinder() - Start running processes, including screen
function start_cinder() { function start_cinder() {
if is_service_enabled c-vol; then if is_service_enabled c-vol; then
# Delete any old stack.conf
sudo rm -f /etc/tgt/conf.d/stack.conf
_configure_tgt_for_config_d _configure_tgt_for_config_d
if [[ ! -f /etc/tgt/conf.d/stack.conf ]]; then
echo "include $CINDER_STATE_PATH/volumes/*" | sudo tee /etc/tgt/conf.d/stack.conf
fi
if is_ubuntu; then if is_ubuntu; then
# tgt in oneiric doesn't restart properly if tgtd isn't running # tgt in oneiric doesn't restart properly if tgtd isn't running
# do it in two steps # do it in two steps