openstack/puppet-openstack-integration
Code Issues Proposed changes

Align the stars to fix and promote CI

Browse Source 
1) scenario003: disable sahara testing on RDO
Sahara upstream moved the Tempest plugin to another separated
repository.
Until RDO team build the package (see bugzilla link), let's disable
Sahara tempest tests on centos7 runs, so we can continue to promote our
CI without interruption.
https://bugzilla.redhat.com/show_bug.cgi?id=1318765

2) Ubuntu recently updated Newton packaging and Neutron linuxbridge is
again broken. Until we figure out, let's test ovs on scenario003 for
Ubuntu.

2) Promote RDO to latest trunk

Change-Id: Ib84001af0a8f3f3d5a38211c20e6e796a5eb6f50
This commit is contained in:
Emilien Macchi 2016-09-12 09:00:09 -04:00
parent 76a0ffd113
commit 6ea596db11
2 changed files with 12 additions and 6 deletions
fixtures
scenario003.pp
manifests
repos.pp

16
fixtures/scenario003.pp

@ -34,12 +34,18 @@ case $::osfamily {
# - disable SSL
# - disable Trove (Taskmanager is failing)
if ($::operatingsystem == 'Ubuntu') and (versioncmp($::operatingsystemmajrelease, '16') >= 0) {
$ssl_enabled = false
$trove_enabled = false
$ssl_enabled = false
$trove_enabled = false
$sahara_enabled = true
# linuxbridge driver is not working with latest Ubuntu packaging.
$neutron_plugin = 'openvswitch'
} else {
$ssl_enabled = true
# https://bugs.launchpad.net/trove/+bug/1597857
$trove_enabled = true
$trove_enabled = true
# https://bugzilla.redhat.com/show_bug.cgi?id=1318765
$sahara_enabled = false
$neutron_plugin = 'linuxbridge'
}
include ::openstack_integration
@ -56,7 +62,7 @@ class { '::openstack_integration::keystone':
}
include ::openstack_integration::glance
class { '::openstack_integration::neutron':
driver => 'linuxbridge',
driver => $neutron_plugin,
}
include ::openstack_integration::nova
if $trove_enabled {
@ -71,7 +77,7 @@ include ::openstack_integration::provision
class { '::openstack_integration::tempest':
trove => $trove_enabled,
sahara => true,
sahara => $sahara_enabled,
mistral => $mistral_enabled,
horizon => true,
heat => true,

2
manifests/repos.pp

@ -31,7 +31,7 @@ class openstack_integration::repos {
manage_epel => false,
repo_hash => {
'newton-current' => {
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/d3/a8/d3a81238057ac0489e8ff0a1cd19cf72781307bc_d50f43af/',
'baseurl' => 'https://trunk.rdoproject.org/centos7-master/7d/31/7d319c05826d293182bd4595bf55ac28b21b8db9_e74e2f6e/',
'descr' => 'Newton current',
'gpgcheck' => 'no',
'priority' => 1,