Merge "Switch documentation to hardware types"

devstack/example.local.conf

@@ -7,12 +7,13 @@ RABBIT_PASSWORD=$ADMIN_PASSWORD
 SERVICE_PASSWORD=$ADMIN_PASSWORD
 SERVICE_TOKEN=$ADMIN_PASSWORD
 SWIFT_HASH=$ADMIN_PASSWORD
+SWIFT_TEMPURL_KEY=$ADMIN_PASSWORD
 
 # Enable Neutron which is required by Ironic and disable nova-network.
 disable_service n-net n-novnc
 enable_service neutron q-svc q-agt q-dhcp q-l3 q-meta
 
-# Enable Swift for agent_* drivers
+# Enable Swift for storing introspection data
 enable_service s-proxy s-object s-container s-account
 
 # Enable Ironic, Ironic Inspector plugins
@@ -23,31 +24,39 @@ enable_plugin ironic-inspector https://github.com/openstack/ironic-inspector
 disable_service horizon
 disable_service heat h-api h-api-cfn h-api-cw h-eng
 disable_service cinder c-sch c-api c-vol
-disable_service tempest
 
-# Swift temp URL's are required for agent_* drivers.
+# Swift temp URL's are required for the direct deploy interface.
 SWIFT_ENABLE_TEMPURLS=True
 
-# Create 2 virtual machines to pose as Ironic's baremetal nodes.
-IRONIC_VM_COUNT=2
-IRONIC_VM_SPECS_RAM=1024
-IRONIC_VM_SPECS_DISK=10
+# Create 3 virtual machines to pose as Ironic's baremetal nodes.
+IRONIC_VM_COUNT=3
 IRONIC_BAREMETAL_BASIC_OPS=True
 DEFAULT_INSTANCE_TYPE=baremetal
 
-# Enable Ironic drivers.
-IRONIC_ENABLED_DRIVERS=fake,agent_ipmitool,pxe_ipmitool
+# Enable additional hardware types, if needed.
+#IRONIC_ENABLED_HARDWARE_TYPES=ipmi,fake-hardware
+# Don't forget that many hardware types require enabling of additional
+# interfaces, most often power and management:
+#IRONIC_ENABLED_MANAGEMENT_INTERFACES=ipmitool,fake
+#IRONIC_ENABLED_POWER_INTERFACES=ipmitool,fake
+#
+# The 'ipmi' hardware type's default deploy interface is 'iscsi'.
+# This would change the default to 'direct':
+#IRONIC_DEFAULT_DEPLOY_INTERFACE=direct
+
+# Enable inspection via ironic-inspector
+IRONIC_ENABLED_INSPECT_INTERFACES=inspector,no-inspect
+# Make it the default for all hardware types:
+IRONIC_DEFAULT_INSPECT_INTERFACE=inspector
 
 # This driver should be in the enabled list above.
-IRONIC_DEPLOY_DRIVER=agent_ipmitool
+IRONIC_DEPLOY_DRIVER=ipmi
 
 IRONIC_BUILD_DEPLOY_RAMDISK=False
 IRONIC_INSPECTOR_BUILD_RAMDISK=False
 
 VIRT_DRIVER=ironic
 
-TEMPEST_ALLOW_TENANT_ISOLATION=False
-
 # By default, DevStack creates a 10.0.0.0/24 network for instances.
 # If this overlaps with the hosts network, you may adjust with the
 # following.
@@ -57,4 +66,3 @@ FIXED_RANGE=10.1.0.0/24
 # Log all output to files
 LOGDAYS=1
 LOGFILE=$HOME/logs/stack.sh.log
-IRONIC_VM_LOG_DIR=$HOME/ironic-bm-logs

doc/source/user/usage.rst

@@ -233,13 +233,13 @@ the processing :ref:`plugins <introspection_plugins>`, and after that it runs
 introspection rules, which would allow for more customisable node
 configuration, see :ref:`rules <introspection_rules>`.
 
-A rule to set a node's Ironic driver to the ``agent_ipmitool`` driver and
-populate the required driver_info for that driver would look like::
+A rule to set a node's Ironic driver to ``ipmi`` and populate the required
+``driver_info`` for that driver would look like::
 
     [{
         "description": "Set IPMI driver_info if no credentials",
         "actions": [
-            {"action": "set-attribute", "path": "driver", "value": "agent_ipmitool"},
+            {"action": "set-attribute", "path": "driver", "value": "ipmi"},
             {"action": "set-attribute", "path": "driver_info/ipmi_username",
              "value": "username"},
             {"action": "set-attribute", "path": "driver_info/ipmi_password",
@@ -269,9 +269,9 @@ possible to distinguish between manually enrolled nodes and auto-discovered
 nodes in the introspection rules using the rule condition ``eq``::
 
     {
-        "description": "Enroll auto-discovered nodes with fake driver",
+        "description": "Enroll auto-discovered nodes with ipmi hardware type",
         "actions": [
-            {"action": "set-attribute", "path": "driver", "value": "fake"}
+            {"action": "set-attribute", "path": "driver", "value": "ipmi"}
         ],
         "conditions": [
             {"op": "eq", "field": "data://auto_discovered", "value": true}

ironic_inspector/test/base.py

@@ -170,7 +170,7 @@ class NodeTest(InventoryTest):
         super(NodeTest, self).setUp()
         self.uuid = uuidutils.generate_uuid()
         fake_node = {
-            'driver': 'pxe_ipmitool',
+            'driver': 'ipmi',
             'driver_info': {'ipmi_address': self.bmc_address},
             'properties': {'cpu_arch': 'i386', 'local_gb': 40},
             'uuid': self.uuid,