commit 1a5d0339d0c3fb142de3fdedcfacee46d98a977d
author Jenkins <jenkins@review.openstack.org> Thu Mar 21 08:51:44 2013 +0000
committer Gerrit Code Review <review@openstack.org> Thu Mar 21 08:51:44 2013 +0000
tree 60428765e67f754e63ad8eea29293d56cb326955
parent 71404ed5a45fe8fa2b3882c9d633da1bdb94f7b2
parent 13aab25d3da100b494d61548654f29b1999d33ec

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

lib/quantum

diff --git a/lib/quantum b/lib/quantum
index 801279e..09cde64 100644
--- a/lib/quantum
+++ b/lib/quantum
@@ -569,7 +569,12 @@
     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