openstack/devstack
Code Issues Proposed changes

Fix duplicated rootwrap.d in lib/ironic

Browse Source 
The Ironic setup of devstack is duplicating the rootwrap.d directory at
/etc/ironic/rootwrap.d/rootwrap.d, this will cause the ironic-rootwrap
command to fail to execute. This patch is removing the duplicated
rootwrap.d directory.

Change-Id: I24844c24620b5b33ad1a6acd0d872e9df11d6d89
Closes-Bug: #1268930
This commit is contained in:
Lucas Alvares Gomes 2014-01-14 11:37:51 +00:00
parent b200b1d4dd
commit 279295c72c
1 changed files with 1 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/ironic
View File

@ -33,7 +33,6 @@ IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}
IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic}
IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf
IRONIC_ROOTWRAP_CONF=$IRONIC_CONF_DIR/rootwrap.conf
IRONIC_ROOTWRAP_FILTERS=$IRONIC_CONF_DIR/rootwrap.d
IRONIC_POLICY_JSON=$IRONIC_CONF_DIR/policy.json
# Support entry points installation of console scripts
@ -118,7 +117,7 @@ function configure_ironic_api() {
# Sets conductor specific settings.
function configure_ironic_conductor() {
cp $IRONIC_DIR/etc/ironic/rootwrap.conf $IRONIC_ROOTWRAP_CONF
cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_ROOTWRAP_FILTERS
cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR
iniset $IRONIC_CONF DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
}