From 314a6d37bc5f45e16a0785d28bb50ad4a5821c27 Mon Sep 17 00:00:00 2001
From: Dmitry Tantsur <divius.inside@gmail.com>
Date: Wed, 24 Jan 2018 16:22:20 +0100
Subject: [PATCH] Switch the CI to hardware types

The granade job is left intact, as it requires IRONIC_ENABLED_INSPECT_INTERFACES
devstack configuration, which was introduced in Queens.

Change-Id: I0742a0c06a7ecf6ca03673f18f37fdb7ee003aa2
Depends-On: Ib0297f8936bba9449a02fb1a878981ab55687ef9
---
 devstack/plugin.sh                               |  7 +++++++
 .../ironic-inspector-grenade-dsvm/run.yaml       | 13 ++-----------
 .../run.yaml                                     | 16 +++++-----------
 3 files changed, 14 insertions(+), 22 deletions(-)

diff --git a/devstack/plugin.sh b/devstack/plugin.sh
index 9e1dd0d11..3b7ad9c83 100644
--- a/devstack/plugin.sh
+++ b/devstack/plugin.sh
@@ -67,6 +67,13 @@ GITDIR["python-ironic-inspector-client"]=$DEST/python-ironic-inspector-client
 GITREPO["python-ironic-inspector-client"]=${IRONIC_INSPECTOR_CLIENT_REPO:-${GIT_BASE}/openstack/python-ironic-inspector-client.git}
 GITBRANCH["python-ironic-inspector-client"]=${IRONIC_INSPECTOR_CLIENT_BRANCH:-master}
 
+# This is defined in ironic's devstack plugin. Redefine it just in case, and
+# insert "inspector" if it's missing.
+IRONIC_ENABLED_INSPECT_INTERFACES=${IRONIC_ENABLED_INSPECT_INTERFACES:-"inspector,no-inspect"}
+if [[ "$IRONIC_ENABLED_INSPECT_INTERFACES" != *inspector* ]]; then
+    IRONIC_ENABLED_INSPECT_INTERFACES="inspector,$IRONIC_ENABLED_INSPECT_INTERFACES"
+fi
+
 ### Utilities
 
 function mkdir_chown_stack {
diff --git a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml
index 36a24ff74..04ad2f4ef 100644
--- a/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml
+++ b/playbooks/legacy/ironic-inspector-grenade-dsvm/run.yaml
@@ -138,7 +138,9 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_VIRT_DRIVER=ironic
           export DEVSTACK_GATE_CONFIGDRIVE=1
+          # TODO(dtantsur): change to ipmi in Rocky
           export DEVSTACK_GATE_IRONIC_DRIVER=pxe_ipmitool
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=iscsi"
           export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -148,17 +150,6 @@
               export DEVSTACK_GATE_TLSPROXY=1
           fi
 
-          if [ "pxe_ipmitool" == "pxe_snmp" ] ; then
-              # explicitly enable pxe_snmp driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,pxe_snmp"
-          fi
-
-          if [ "pxe_ipmitool" == "redfish" ] ; then
-              # When deploying with redfish we need to enable the "redfish"
-              # hardware type
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
-          fi
-
           if [ "partition" == "wholedisk" ] ; then
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True"
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_VM_EPHEMERAL_DISK=0"
diff --git a/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml b/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml
index bacf27c56..81046e122 100644
--- a/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml
+++ b/playbooks/legacy/ironic-inspector-tempest-dsvm-discovery/run.yaml
@@ -115,7 +115,8 @@
           export DEVSTACK_GATE_NEUTRON=1
           export DEVSTACK_GATE_VIRT_DRIVER=ironic
           export DEVSTACK_GATE_CONFIGDRIVE=1
-          export DEVSTACK_GATE_IRONIC_DRIVER=agent_ipmitool
+          export DEVSTACK_GATE_IRONIC_DRIVER=ipmi
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_DEFAULT_DEPLOY_INTERFACE=direct"
           export BRANCH_OVERRIDE="{{ branch_override | default('default') }}"
           if [ "$BRANCH_OVERRIDE" != "default" ] ; then
               export OVERRIDE_ZUUL_BRANCH=$BRANCH_OVERRIDE
@@ -125,16 +126,9 @@
               export DEVSTACK_GATE_TLSPROXY=1
           fi
 
-          if [ "agent_ipmitool" == "pxe_snmp" ] ; then
-              # explicitly enable pxe_snmp driver
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_DRIVERS=fake,pxe_snmp"
-          fi
-
-          if [ "agent_ipmitool" == "redfish" ] ; then
-              # When deploying with redfish we need to enable the "redfish"
-              # hardware type
-              export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_ENABLED_HARDWARE_TYPES=redfish"
-          fi
+          # direct deploy requires Swift temporary URLs
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_ENABLE_TEMPURLS=True"
+          export DEVSTACK_LOCAL_CONFIG+=$'\n'"SWIFT_TEMPURL_KEY=secretkey"
 
           if [ "wholedisk" == "wholedisk" ] ; then
             export DEVSTACK_LOCAL_CONFIG+=$'\n'"IRONIC_TEMPEST_WHOLE_DISK_IMAGE=True"