From 2f7de3264c6f5199f3f5e0261ac2346572680dd8 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <dtantsur@protonmail.com>
Date: Wed, 7 Aug 2019 14:09:31 +0200
Subject: [PATCH] Enable testing software RAID in the standalone job

Change-Id: Id5cc1854492df230e6657bc8450c49a52f21ac16
Depends-On: https://review.opendev.org/#/c/675064/
---
 devstack/lib/ironic     | 4 ++++
 zuul.d/ironic-jobs.yaml | 1 +
 2 files changed, 5 insertions(+)

diff --git a/devstack/lib/ironic b/devstack/lib/ironic
index 6aa0687c54..ebbf28e2b3 100644
--- a/devstack/lib/ironic
+++ b/devstack/lib/ironic
@@ -2746,6 +2746,10 @@ function ironic_configure_tempest {
         iniset $TEMPEST_CONFIG baremetal unrescue_timeout $IRONIC_TEMPEST_BUILD_TIMEOUT
     fi
 
+    if [[ $IRONIC_VM_VOLUME_COUNT -gt 1 ]]; then
+        iniset $TEMPEST_CONFIG baremetal_feature_enabled software_raid True
+    fi
+
     # Enabled features
     iniset $TEMPEST_CONFIG baremetal_feature_enabled ipxe_enabled $IRONIC_IPXE_ENABLED
     iniset $TEMPEST_CONFIG baremetal_feature_enabled fast_track_discovery $IRONIC_DEPLOY_FAST_TRACK
diff --git a/zuul.d/ironic-jobs.yaml b/zuul.d/ironic-jobs.yaml
index f7a9ffe184..88e176b0b7 100644
--- a/zuul.d/ironic-jobs.yaml
+++ b/zuul.d/ironic-jobs.yaml
@@ -94,6 +94,7 @@
         IRONIC_ENABLED_DEPLOY_INTERFACES: "iscsi,direct,ansible"
         IRONIC_RPC_TRANSPORT: json-rpc
         IRONIC_VM_COUNT: 6
+        IRONIC_VM_VOLUME_COUNT: 2
         SWIFT_ENABLE_TEMPURLS: True
         SWIFT_TEMPURL_KEY: secretkey
       devstack_services: