Merge "scenario002: test ironic on Ubuntu again"

fixtures/scenario002.pp

@@ -16,17 +16,13 @@
 
 case $::osfamily {
   'Debian': {
-    $ipv6           = false
-    # ironic-conductor is broken for Ubuntu Trusty
-    # https://bugs.launchpad.net/cloud-archive/+bug/1530869
-    $ironic_enabled = false
+    $ipv6          = false
     # zaqar is not packaged in Ubuntu Trusty
-    $zaqar_enabled  = false
+    $zaqar_enabled = false
   }
   'RedHat': {
-    $ipv6           = true
-    $ironic_enabled = true
-    $zaqar_enabled  = true
+    $ipv6          = true
+    $zaqar_enabled = true
   }
   default: {
     fail("Unsupported osfamily (${::osfamily})")
@@ -58,6 +54,6 @@ include ::openstack_integration::provision
 class { '::openstack_integration::tempest':
   cinder => true,
   swift  => true,
-  ironic => $ironic_enabled,
+  ironic => true,
   zaqar  => $zaqar_enabled,
 }