@@ -26,6 +26,7 @@ Ken Pepple <ken.pepple@rabbityard.com>

 Kiall Mac Innes <kiall@managedit.ie>

 Russell Bryant <rbryant@redhat.com>

 Scott Moser <smoser@ubuntu.com>

+Thierry Carrez <thierry@openstack.org>

 Todd Willey <xtoddx@gmail.com>

 Tres Henry <tres@treshenry.net>

 Vishvananda Ishaya <vishvananda@gmail.com>

@@ -187,13 +187,6 @@ else

     sudo chown root:root $TEMPFILE

     sudo mv $TEMPFILE /etc/sudoers.d/50_stack_sh

-    # Set up the rootwrap sudoers

-    TEMPFILE=`mktemp`

-    echo "$USER ALL=(root) NOPASSWD: $NOVA_ROOTWRAP" >$TEMPFILE

-    chmod 0440 $TEMPFILE

-    sudo chown root:root $TEMPFILE

-    sudo mv $TEMPFILE /etc/sudoers.d/nova-rootwrap

-

     # Remove old file

     sudo rm -f /etc/sudoers.d/stack_sh_nova

 fi

@@ -1189,6 +1182,13 @@ sudo chown `whoami` $NOVA_CONF_DIR

 cp -p $NOVA_DIR/etc/nova/policy.json $NOVA_CONF_DIR

+# Set up the rootwrap sudoers

+TEMPFILE=`mktemp`

+echo "$USER ALL=(root) NOPASSWD: $NOVA_ROOTWRAP" >$TEMPFILE

+chmod 0440 $TEMPFILE

+sudo chown root:root $TEMPFILE

+sudo mv $TEMPFILE /etc/sudoers.d/nova-rootwrap

+

 if is_service_enabled n-api; then

     # Use the sample http middleware configuration supplied in the

     # Nova sources.  This paste config adds the configuration required