Skip to content

Commit 7872d52

Browse files
Jenkinsopenstack-gerrit
authored andcommitted
Merge "Fix duplicated rootwrap.d in lib/ironic"
2 parents 65a6aed + 279295c commit 7872d52

1 file changed

Lines changed: 1 addition & 2 deletions

File tree

‎lib/ironic‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,6 @@ IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}
3333
IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic}
3434
IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf
3535
IRONIC_ROOTWRAP_CONF=$IRONIC_CONF_DIR/rootwrap.conf
36-
IRONIC_ROOTWRAP_FILTERS=$IRONIC_CONF_DIR/rootwrap.d
3736
IRONIC_POLICY_JSON=$IRONIC_CONF_DIR/policy.json
3837

3938
# Support entry points installation of console scripts
@@ -118,7 +117,7 @@ function configure_ironic_api() {
118117
# Sets conductor specific settings.
119118
function configure_ironic_conductor() {
120119
cp $IRONIC_DIR/etc/ironic/rootwrap.conf $IRONIC_ROOTWRAP_CONF
121-
cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_ROOTWRAP_FILTERS
120+
cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR
122121

123122
iniset $IRONIC_CONF DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
124123
}

0 commit comments

Comments
 (0)