openstack/puppet-openstack-integration
Code Issues Proposed changes

Enable ironic tests back for Ubuntu

Browse Source 
As tempest tests for ironic are fixed:
https://review.openstack.org/322608 and we are using
latest tempest, we can enable them back for Ubuntu.

Change-Id: I1dfbedf85f9ef170f59b7c4cac1413be23ffba55
This commit is contained in:
iberezovskiy 2016-07-25 14:39:18 +03:00
parent e42e4cce90
commit 60b90fa2fa
1 changed files with 2 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
fixtures/scenario002.pp
View File

@ -19,16 +19,10 @@ case $::osfamily {
$ipv6 = false $ipv6 = false
# zaqar is not packaged in Ubuntu Trusty # zaqar is not packaged in Ubuntu Trusty
$zaqar_enabled = false $zaqar_enabled = false
# TODO(emilien): enable again when deploying Newton
# A recent patch in Tempest broke tests in Ironic Mitaka
# Fixed in master: https://review.openstack.org/322608 but
# not backported.
$ironic_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$zaqar_enabled = true $zaqar_enabled = true
$ironic_enabled = true
} }
default: { default: {
fail("Unsupported osfamily (${::osfamily})") fail("Unsupported osfamily (${::osfamily})")
@ -58,9 +52,7 @@ include ::openstack_integration::neutron
include ::openstack_integration::nova include ::openstack_integration::nova
include ::openstack_integration::cinder include ::openstack_integration::cinder
include ::openstack_integration::swift include ::openstack_integration::swift
if $ironic_enabled { include ::openstack_integration::ironic
include ::openstack_integration::ironic
}
include ::openstack_integration::zaqar include ::openstack_integration::zaqar
include ::openstack_integration::mongodb include ::openstack_integration::mongodb
include ::openstack_integration::provision include ::openstack_integration::provision
@ -69,6 +61,6 @@ include ::openstack_integration::provision
class { '::openstack_integration::tempest': class { '::openstack_integration::tempest':
cinder => true, cinder => true,
swift => true, swift => true,
ironic => $ironic_enabled, ironic => true,
zaqar => $zaqar_enabled, zaqar => $zaqar_enabled,
} }