Merge "DevStack: Parametrize automated_clean"

This commit is contained in:
Jenkins 2016-04-22 09:50:13 +00:00 committed by Gerrit Code Review
commit 0efe6a3248

View File

@ -221,6 +221,8 @@ function get_pxe_boot_file {
# PXE boot image
IRONIC_PXE_BOOT_IMAGE=${IRONIC_PXE_BOOT_IMAGE:-$(get_pxe_boot_file)}
IRONIC_AUTOMATED_CLEAN_ENABLED=$(trueorfalse True IRONIC_AUTOMATED_CLEAN_ENABLED)
# Functions
# ---------
@ -409,6 +411,8 @@ function configure_ironic_api {
iniset_rpc_backend ironic $IRONIC_CONF_FILE
iniset $IRONIC_CONF_FILE api port $IRONIC_SERVICE_PORT
iniset $IRONIC_CONF_FILE conductor automated_clean $IRONIC_AUTOMATED_CLEAN_ENABLED
cp -p $IRONIC_DIR/etc/ironic/policy.json $IRONIC_POLICY_JSON
}