openstack/puppet-openstack-integration
Code Issues Proposed changes

Merge "Add Sahara CI for Xenial"

Browse Source
This commit is contained in:
Jenkins 2017-09-14 23:20:01 +00:00 committed by Gerrit Code Review
commit da4da76eca
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 $mistral_enabled = false
# murano package should be fixed on Ubuntu Xenial # murano package should be fixed on Ubuntu Xenial
$murano_enabled = false $murano_enabled = false
# TODO(aschultz): sahara is currently missing from xenial pike
$sahara_enabled = false
# trove package contains broken Tempest tests # trove package contains broken Tempest tests
$trove = false $trove = false
} }
@ -30,7 +28,6 @@ case $::osfamily {
$ipv6 = true $ipv6 = true
$mistral_enabled = true $mistral_enabled = true
$murano_enabled = true $murano_enabled = true
$sahara_enabled = true
$trove_enabled = true $trove_enabled = true
} }
default: { default: {
@ -72,9 +69,7 @@ if $trove_enabled {
} }
include ::openstack_integration::horizon include ::openstack_integration::horizon
include ::openstack_integration::heat include ::openstack_integration::heat
if $sahara_enabled { include ::openstack_integration::sahara
include ::openstack_integration::sahara
}
if $designate_enabled { if $designate_enabled {
include ::openstack_integration::designate include ::openstack_integration::designate
} }

3
manifests/sahara.pp
View File

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