From 68c853c07a8344e85e47f02ebd5633daeeebeb2b Mon Sep 17 00:00:00 2001
From: Emilien Macchi <emilien@redhat.com>
Date: Tue, 19 Apr 2016 14:26:10 -0400
Subject: [PATCH] scenario002: test ironic on Ubuntu again

Re-enable Ironic testing on Ubuntu.

Depends-On: I34014d3c44876091f698023c6b896f3d55b7756d
Change-Id: I646568f4750e70e47d9b8aa7bf452b08be068a83
---
 fixtures/scenario002.pp | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/fixtures/scenario002.pp b/fixtures/scenario002.pp
index 60c473f52..c3b608b13 100644
--- a/fixtures/scenario002.pp
+++ b/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,
 }