diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index bd635c487f..958b65a6ae 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -37,7 +37,7 @@ if is_service_enabled ir-api ir-cond; then
             # Initialize ironic
             init_ironic
 
-            if [[ "$IRONIC_IS_HARDWARE" == "False" ]]; then
+            if [[ "$IRONIC_BAREMETAL_BASIC_OPS" == "True" && "$IRONIC_IS_HARDWARE" == "False" ]]; then
                 echo_summary "Creating bridge and VMs"
                 create_bridge_and_vms
             fi