openstack/devstack
Code Issues Proposed changes

Merge "Put cinder rootwrap config in separate function"

Browse Source
This commit is contained in:
Jenkins 2014-01-12 13:51:27 +00:00 committed by Gerrit Code Review
commit 1d8abb95b9
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
lib/cinder
View File

@ -163,15 +163,8 @@ function cleanup_cinder() {
fi fi
} }
# configure_cinder() - Set config files, create data dirs, etc # configure_cinder_rootwrap() - configure Cinder's rootwrap
function configure_cinder() { function configure_cinder_rootwrap() {
if [[ ! -d $CINDER_CONF_DIR ]]; then
sudo mkdir -p $CINDER_CONF_DIR
fi
sudo chown $STACK_USER $CINDER_CONF_DIR
cp -p $CINDER_DIR/etc/cinder/policy.json $CINDER_CONF_DIR
# Set the paths of certain binaries # Set the paths of certain binaries
CINDER_ROOTWRAP=$(get_rootwrap_location cinder) CINDER_ROOTWRAP=$(get_rootwrap_location cinder)
if [[ ! -x $CINDER_ROOTWRAP ]]; then if [[ ! -x $CINDER_ROOTWRAP ]]; then
@ -214,6 +207,18 @@ function configure_cinder() {
chmod 0440 $TEMPFILE chmod 0440 $TEMPFILE
sudo chown root:root $TEMPFILE sudo chown root:root $TEMPFILE
sudo mv $TEMPFILE /etc/sudoers.d/cinder-rootwrap sudo mv $TEMPFILE /etc/sudoers.d/cinder-rootwrap
}
# configure_cinder() - Set config files, create data dirs, etc
function configure_cinder() {
if [[ ! -d $CINDER_CONF_DIR ]]; then
sudo mkdir -p $CINDER_CONF_DIR
fi
sudo chown $STACK_USER $CINDER_CONF_DIR
cp -p $CINDER_DIR/etc/cinder/policy.json $CINDER_CONF_DIR
configure_cinder_rootwrap
cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI