Merge "minimize the default services"
diff --git a/files/rpms/general b/files/rpms/general
index bc0d6c7..e17d6d6 100644
--- a/files/rpms/general
+++ b/files/rpms/general
@@ -28,3 +28,4 @@
net-tools
java-1.7.0-openjdk-headless # NOPRIME rhel7,f20
java-1.8.0-openjdk-headless # NOPRIME f21,f22
+pyOpenSSL # version in pip uses too much memory
diff --git a/lib/ironic b/lib/ironic
index fcf1a54..c8481ab 100644
--- a/lib/ironic
+++ b/lib/ironic
@@ -370,6 +370,7 @@
iniset $IRONIC_CONF_FILE glance swift_container glance
iniset $IRONIC_CONF_FILE glance swift_temp_url_duration 3600
iniset $IRONIC_CONF_FILE agent heartbeat_timeout 30
+ iniset $IRONIC_CONF_FILE agent agent_erase_devices_priority 0
fi
if [[ "$IRONIC_IPXE_ENABLED" == "True" ]] ; then
diff --git a/lib/tempest b/lib/tempest
index 3f33512..0a7ff06 100644
--- a/lib/tempest
+++ b/lib/tempest
@@ -469,6 +469,7 @@
# Baremetal
if [ "$VIRT_DRIVER" = "ironic" ] ; then
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 console_output False
iniset $TEMPEST_CONFIG compute-feature-enabled interface_attach False