@@ -38,11 +38,17 @@ function add_sudo_secure_path {

 # Configure rootwrap

 # Make a load of assumptions otherwise we'll have 6 arguments

-# configure_rootwrap project bin conf-src-dir

+# configure_rootwrap project

 function configure_rootwrap {

-    local project=$1                    # xx

-    local rootwrap_bin=$2               # /opt/stack/xx.venv/bin/xx-rootwrap

-    local rootwrap_conf_src_dir=$3      # /opt/stack/xx/etc/xx

+    local project=$1

+    local project_uc=$(echo $1|tr a-z A-Z)

+    local bin_dir="${project_uc}_BIN_DIR"

+    bin_dir="${!bin_dir}"

+    local project_dir="${project_uc}_DIR"

+    project_dir="${!project_dir}"

+

+    local rootwrap_conf_src_dir="${project_dir}/etc/${project}"

+    local rootwrap_bin="${bin_dir}/${project}-rootwrap"

     # Start fresh with rootwrap filters

     sudo rm -rf /etc/${project}/rootwrap.d

@@ -254,7 +254,7 @@ function configure_ceilometer {

     if is_service_enabled ceilometer-aipmi; then

         # Configure rootwrap for the ipmi agent

-        configure_rootwrap ceilometer $CEILOMETER_BIN_DIR/ceilometer-rootwrap $CEILOMETER_DIR/etc/ceilometer

+        configure_rootwrap ceilometer

     fi

 }

@@ -190,7 +190,7 @@ function configure_cinder {

     rm -f $CINDER_CONF

-    configure_rootwrap cinder $CINDER_BIN_DIR/cinder-rootwrap $CINDER_DIR/etc/cinder

+    configure_rootwrap cinder

     cp $CINDER_DIR/etc/cinder/api-paste.ini $CINDER_API_PASTE_INI

@@ -298,7 +298,7 @@ function configure_nova {

     install_default_policy nova

-    configure_rootwrap nova $NOVA_BIN_DIR/nova-rootwrap $NOVA_DIR/etc/nova

+    configure_rootwrap nova

     if [[ "$ENABLED_SERVICES" =~ "n-api" ]]; then

         # Get the sample configuration file in place