openstack/puppet-openstack-integration
Code Issues Proposed changes

Add integration_enable option to beaker test in sahara

Browse Source 
Change-Id: Iaa472948e451ef6a0f3dc43356daed97cc9da4a7
This commit is contained in:
ZhongShengping 2018-03-15 15:00:18 +08:00
parent 04263926a5
commit 246b2c0d52
1 changed files with 33 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
manifests/sahara.pp
View File

@ -1,4 +1,12 @@
class openstack_integration::sahara { # Configure the Sahara service
#
# [*integration_enable*]
# (optional) Boolean to run integration tests.
# Defaults to true.
#
class openstack_integration::sahara (
$integration_enable = true,
){
include ::openstack_integration::config include ::openstack_integration::config
include ::openstack_integration::params include ::openstack_integration::params
@ -48,29 +56,31 @@ class openstack_integration::sahara {
class { '::sahara::client': } class { '::sahara::client': }
class { '::sahara::notify': } class { '::sahara::notify': }
# create simple sahara templates if $integration_enable {
sahara_node_group_template { 'master': # create simple sahara templates
ensure => present, sahara_node_group_template { 'master':
plugin => 'vanilla', ensure => present,
plugin_version => '2.7.1', plugin => 'vanilla',
flavor => 'm1.micro', plugin_version => '2.7.1',
node_processes => [ 'namenode', 'resourcemanager' ], flavor => 'm1.micro',
} node_processes => [ 'namenode', 'resourcemanager' ],
}
sahara_node_group_template { 'worker': sahara_node_group_template { 'worker':
ensure => present, ensure => present,
plugin => 'vanilla', plugin => 'vanilla',
plugin_version => '2.7.1', plugin_version => '2.7.1',
flavor => 'm1.micro', flavor => 'm1.micro',
node_processes => [ 'datanode', 'nodemanager' ], node_processes => [ 'datanode', 'nodemanager' ],
} }
sahara_cluster_template { 'cluster': sahara_cluster_template { 'cluster':
ensure => present, ensure => present,
node_groups => [ 'master:1', 'worker:2' ] node_groups => [ 'master:1', 'worker:2' ]
} }
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<||>
}
} }