From 279295c72c4e7028fc6eac75412b9b5f92cd630b Mon Sep 17 00:00:00 2001 From: Lucas Alvares Gomes Date: Tue, 14 Jan 2014 11:37:51 +0000 Subject: [PATCH] Fix duplicated rootwrap.d in lib/ironic 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 --- lib/ironic | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/lib/ironic b/lib/ironic index 1ff3c81f06..afbc3e09e4 100644 --- a/lib/ironic +++ b/lib/ironic @@ -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 }