openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "scenario002: test ironic on Ubuntu again"

Browse Source
This commit is contained in:
Jenkins 2016-04-21 20:31:02 +00:00 committed by Gerrit Code Review
commit a724751360
1 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
fixtures/scenario002.pp
View File

@ -17,15 +17,11 @@
case $::osfamily { case $::osfamily {
'Debian': { 'Debian': {
$ipv6 = false $ipv6 = false
# ironic-conductor is broken for Ubuntu Trusty
# https://bugs.launchpad.net/cloud-archive/+bug/1530869
$ironic_enabled = false
# zaqar is not packaged in Ubuntu Trusty # zaqar is not packaged in Ubuntu Trusty
$zaqar_enabled = false $zaqar_enabled = false
} }
'RedHat': { 'RedHat': {
$ipv6 = true $ipv6 = true
$ironic_enabled = true
$zaqar_enabled = true $zaqar_enabled = true
} }
default: { default: {
@ -58,6 +54,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,
} }