openstack/puppet-openstack-integration
Code Issues Proposed changes

Re-enable linuxbridge testing on Ubuntu

Browse Source 
Change-Id: Ic85df072aaca8e0193ced68ad9ea746eea7baa6b
This commit is contained in:
David Moreau-Simard 2016-09-29 09:42:15 -04:00 committed by Alex Schultz
parent 1dba54323f
commit 444375d79f
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
fixtures/scenario003.pp
View File

@ -39,14 +39,11 @@ case $::osfamily {
# - disable SSL # - disable SSL
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) { if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false $ssl_enabled = false
# linuxbridge driver is not working with latest Ubuntu packaging.
$neutron_plugin = 'openvswitch'
# Disable Designate MDS on Ubuntu until we find why Puppet run is not # Disable Designate MDS on Ubuntu until we find why Puppet run is not
# idempotent sometimes. # idempotent sometimes.
$designate_enabled = false $designate_enabled = false
} else { } else {
$ssl_enabled = true $ssl_enabled = true
$neutron_plugin = 'linuxbridge'
$designate_enabled = true $designate_enabled = true
} }
@ -64,7 +61,7 @@ class { '::openstack_integration::keystone':
} }
include ::openstack_integration::glance include ::openstack_integration::glance
class { '::openstack_integration::neutron': class { '::openstack_integration::neutron':
driver => $neutron_plugin, driver => 'linuxbridge',
} }
include ::openstack_integration::nova include ::openstack_integration::nova
if $trove_enabled { if $trove_enabled {