openstack/devstack
Code Issues Proposed changes

Merge "Accept Quantums rootwrap.conf in etc/quantum/rootwrap.conf"

Browse Source
This commit is contained in:
Jenkins 2013-03-21 08:51:44 +00:00 committed by Gerrit Code Review
commit 1a5d0339d0
1 changed files with 6 additions and 1 deletions

7
lib/quantum

@ -569,7 +569,12 @@ function _quantum_setup_rootwrap() {
sudo chown -R root:root $Q_CONF_ROOTWRAP_D
sudo chmod 644 $Q_CONF_ROOTWRAP_D/*
# Set up rootwrap.conf, pointing to $QUANTUM_CONF_DIR/rootwrap.d
sudo cp -p $QUANTUM_DIR/etc/rootwrap.conf $Q_RR_CONF_FILE
# location moved in newer versions, prefer new location
if test -r $QUANTUM_DIR/etc/quantum/rootwrap.conf; then
sudo cp -p $QUANTUM_DIR/etc/quantum/rootwrap.conf $Q_RR_CONF_FILE
else
sudo cp -p $QUANTUM_DIR/etc/rootwrap.conf $Q_RR_CONF_FILE
fi
sudo sed -e "s:^filters_path=.*$:filters_path=$Q_CONF_ROOTWRAP_D:" -i $Q_RR_CONF_FILE
sudo chown root:root $Q_RR_CONF_FILE
sudo chmod 0644 $Q_RR_CONF_FILE