Skip to content

Commit 76a9eaf

Browse files
ttxttx
committed
Support last version of upcoming rootwrap changes
Hopefully last adjustment needed to support the upcoming rootwrap changes at https://review.openstack.org/#/c/8747/. I think core reviewers there finally agree on where things should live and how they should be named. Change-Id: If8814ca0d147856aeed37676e9c3de4767b561c0
1 parent 8d2c8fa commit 76a9eaf

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

‎stack.sh‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1232,19 +1232,19 @@ cp -p $NOVA_DIR/etc/nova/policy.json $NOVA_CONF_DIR
12321232
# If Nova ships the new rootwrap filters files, deploy them
12331233
# (owned by root) and add a parameter to $NOVA_ROOTWRAP
12341234
ROOTWRAP_SUDOER_CMD="$NOVA_ROOTWRAP"
1235-
if [[ -d $NOVA_DIR/etc/nova/rootwrap ]]; then
1235+
if [[ -d $NOVA_DIR/etc/nova/rootwrap.d ]]; then
12361236
# Wipe any existing rootwrap.d files first
12371237
if [[ -d $NOVA_CONF_DIR/rootwrap.d ]]; then
12381238
sudo rm -rf $NOVA_CONF_DIR/rootwrap.d
12391239
fi
12401240
# Deploy filters to /etc/nova/rootwrap.d
12411241
sudo mkdir -m 755 $NOVA_CONF_DIR/rootwrap.d
1242-
sudo cp $NOVA_DIR/etc/nova/rootwrap/*.filters $NOVA_CONF_DIR/rootwrap.d
1242+
sudo cp $NOVA_DIR/etc/nova/rootwrap.d/*.filters $NOVA_CONF_DIR/rootwrap.d
12431243
sudo chown -R root:root $NOVA_CONF_DIR/rootwrap.d
12441244
sudo chmod 644 $NOVA_CONF_DIR/rootwrap.d/*
12451245
# Set up rootwrap.conf, pointing to /etc/nova/rootwrap.d
12461246
sudo cp $NOVA_DIR/etc/nova/rootwrap.conf $NOVA_CONF_DIR/
1247-
sudo sed -e "s:^path=.*$:path=$NOVA_CONF_DIR/rootwrap.d:" -i $NOVA_CONF_DIR/rootwrap.conf
1247+
sudo sed -e "s:^filters_path=.*$:filters_path=$NOVA_CONF_DIR/rootwrap.d:" -i $NOVA_CONF_DIR/rootwrap.conf
12481248
sudo chown root:root $NOVA_CONF_DIR/rootwrap.conf
12491249
sudo chmod 0644 $NOVA_CONF_DIR/rootwrap.conf
12501250
# Specify rootwrap.conf as first parameter to nova-rootwrap

0 commit comments

Comments
 (0)