openstack/devstack
Code Issues Proposed changes

Merge "Prepare devstack for Ironic cleaning testing"

Browse Source
This commit is contained in:
Jenkins 2015-04-02 19:55:39 +00:00 committed by Gerrit Code Review
commit b56031ead1
2 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
lib/ironic
View File

@ -370,6 +370,7 @@ function configure_ironic_conductor {
iniset $IRONIC_CONF_FILE glance swift_container glance iniset $IRONIC_CONF_FILE glance swift_container glance
iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600 iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30 iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30
iniset $IRONIC_CONF_FILE agent agent_erase_devices_priority 0
fi fi
if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then

1
lib/tempest
View File

@ -469,6 +469,7 @@ function configure_tempest {
# Baremetal # Baremetal
if [ "$VIRT_DRIVER" = "ironic" ] ; then if [ "$VIRT_DRIVER" = "ironic" ] ; then
iniset $TEMPEST_CONFIG baremetal driver_enabled True iniset $TEMPEST_CONFIG baremetal driver_enabled True
iniset $TEMPEST_CONFIG baremetal unprovision_timeout 300
iniset $TEMPEST_CONFIG compute-feature-enabled change_password False iniset $TEMPEST_CONFIG compute-feature-enabled change_password False
iniset $TEMPEST_CONFIG compute-feature-enabled console_output False iniset $TEMPEST_CONFIG compute-feature-enabled console_output False
iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False