openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "ubuntu: re-enable Ironic and Linuxbridge"

Browse Source
This commit is contained in:
Jenkins 2016-09-09 15:17:49 +00:00 committed by Gerrit Code Review
commit f3e54e73e4
2 changed files with 9 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fixtures/scenario002.pp
View File

@ -34,13 +34,10 @@ case $::osfamily {
} }
# Disable SSL (workaround for Xenial) # Disable SSL (workaround for Xenial)
# Also disable Ironic. Newton latest packages in Ubuntu are broken.
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false $ssl_enabled = false
$ironic_enabled = false
} else { } else {
$ssl_enabled = true $ssl_enabled = true
$ironic_enabled = true
} }
include ::openstack_integration include ::openstack_integration
@ -58,9 +55,7 @@ class { '::openstack_integration::glance':
} }
include ::openstack_integration::neutron include ::openstack_integration::neutron
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
@ -80,7 +75,7 @@ if $barbican_enabled {
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,
attach_encrypted_volume => $barbican_enabled, attach_encrypted_volume => $barbican_enabled,
} }

13
fixtures/scenario003.pp
View File

@ -34,15 +34,12 @@ case $::osfamily {
# - disable SSL # - disable SSL
# - disable Trove (Taskmanager is failing) # - disable Trove (Taskmanager is failing)
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false $ssl_enabled = false
$trove_enabled = false $trove_enabled = false
# https://bugs.launchpad.net/cloud-archive/+bug/1621651
$neutron_driver = 'openvswitch'
} else { } else {
$ssl_enabled = true $ssl_enabled = true
# https://bugs.launchpad.net/trove/+bug/1597857 # https://bugs.launchpad.net/trove/+bug/1597857
$trove_enabled = true $trove_enabled = true
$neutron_driver = 'linuxbridge'
} }
include ::openstack_integration include ::openstack_integration
@ -59,7 +56,7 @@ class { '::openstack_integration::keystone':
} }
include ::openstack_integration::glance include ::openstack_integration::glance
class { '::openstack_integration::neutron': class { '::openstack_integration::neutron':
driver => $neutron_driver, driver => 'linuxbridge',
} }
include ::openstack_integration::nova include ::openstack_integration::nova
if $trove_enabled { if $trove_enabled {