Browse code

Merge "Fix duplicated rootwrap.d in lib/ironic"

Jenkins authored on 2014/01/26 00:16:06
Showing 1 changed files
... ...
@@ -33,7 +33,6 @@ IRONIC_AUTH_CACHE_DIR=${IRONIC_AUTH_CACHE_DIR:-/var/cache/ironic}
33 33
 IRONIC_CONF_DIR=${IRONIC_CONF_DIR:-/etc/ironic}
34 34
 IRONIC_CONF_FILE=$IRONIC_CONF_DIR/ironic.conf
35 35
 IRONIC_ROOTWRAP_CONF=$IRONIC_CONF_DIR/rootwrap.conf
36
-IRONIC_ROOTWRAP_FILTERS=$IRONIC_CONF_DIR/rootwrap.d
37 36
 IRONIC_POLICY_JSON=$IRONIC_CONF_DIR/policy.json
38 37
 
39 38
 # Support entry points installation of console scripts
... ...
@@ -118,7 +117,7 @@ function configure_ironic_api() {
118 118
 # Sets conductor specific settings.
119 119
 function configure_ironic_conductor() {
120 120
     cp $IRONIC_DIR/etc/ironic/rootwrap.conf $IRONIC_ROOTWRAP_CONF
121
-    cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_ROOTWRAP_FILTERS
121
+    cp -r $IRONIC_DIR/etc/ironic/rootwrap.d $IRONIC_CONF_DIR
122 122
 
123 123
     iniset $IRONIC_CONF DEFAULT rootwrap_config $IRONIC_ROOTWRAP_CONF
124 124
 }