scenario002: enable zaqar again

https://bugs.launchpad.net/zaqar/+bug/1583358 is fixed & released, so we
can enable Zaqar testing again.

Change-Id: I9423ea4b3afeb858d37da124b757bfeb2d7feaed
This commit is contained in:
Emilien Macchi 2016-05-24 15:56:06 -04:00 committed by Ivan Berezovskiy
parent d3bb7ef6f7
commit 2e766b8d61

View File

@ -22,11 +22,7 @@ case $::osfamily {
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
# Zaqar tempest tests are now broken $zaqar_enabled = true
# It's because Falcon is too old in OpenStack requierements
# and therefore in RDO trunk.
# https://bugs.launchpad.net/zaqar/+bug/1583358
$zaqar_enabled = false
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")
@ -50,8 +46,7 @@ include ::openstack_integration::nova
include ::openstack_integration::cinder include ::openstack_integration::cinder
include ::openstack_integration::swift include ::openstack_integration::swift
include ::openstack_integration::ironic include ::openstack_integration::ironic
# Zaqar disabled, see above include ::openstack_integration::zaqar
# include ::openstack_integration::zaqar
include ::openstack_integration::mongodb include ::openstack_integration::mongodb
include ::openstack_integration::provision include ::openstack_integration::provision