openstack/puppet-openstack-integration
Code Issues Proposed changes

Add Sahara CI for Xenial

Browse Source 
Sahara is currently not being tested in Xenial, this patch adds
it to the list of packages to be deployed and tested.

Change-Id: If05607b8dcfa22331165779e2fa248816ffe2347
This commit is contained in:
Mohammed Naser 2017-09-13 12:25:12 -04:00
parent 6832d75a96
commit 3df2ff38c3
No known key found for this signature in database
GPG Key ID: 481CBC90384AEC42
2 changed files with 25 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fixtures/scenario003.pp
View File

@ -21,8 +21,6 @@ case $::osfamily {
$mistral_enabled = false
# murano package should be fixed on Ubuntu Xenial
$murano_enabled = false
# TODO(aschultz): sahara is currently missing from xenial pike
$sahara_enabled = false
# trove package contains broken Tempest tests
$trove = false
}
@ -30,7 +28,6 @@ case $::osfamily {
$ipv6 = true
$mistral_enabled = true
$murano_enabled = true
$sahara_enabled = true
$trove_enabled = true
}
default: {
@ -72,9 +69,7 @@ if $trove_enabled {
}
include ::openstack_integration::horizon
include ::openstack_integration::heat
if $sahara_enabled {
include ::openstack_integration::sahara
}
include ::openstack_integration::sahara
if $designate_enabled {
include ::openstack_integration::designate
}

3
manifests/sahara.pp
View File

@ -65,8 +65,6 @@ class openstack_integration::sahara {
class { '::sahara::client': }
class { '::sahara::notify': }
# for ubuntu we need saharaclient >= 0.15.0
if $::osfamily == 'RedHat' {
# create simple sahara templates
sahara_node_group_template { 'master':
ensure => present,
@ -92,5 +90,4 @@ class openstack_integration::sahara {
Nova_flavor<||> -> Sahara_node_group_template<||>
Class['::sahara::keystone::auth'] -> Sahara_node_group_template<||>
Class['::openstack_extras::auth_file'] -> Sahara_node_group_template<||>
}
}