From 246b2c0d5250b27005940734b515061d445fb169 Mon Sep 17 00:00:00 2001
From: ZhongShengping <chdzsp@163.com>
Date: Thu, 15 Mar 2018 15:00:18 +0800
Subject: [PATCH] Add integration_enable option to beaker test in sahara

Change-Id: Iaa472948e451ef6a0f3dc43356daed97cc9da4a7
---
 manifests/sahara.pp | 56 ++++++++++++++++++++++++++-------------------
 1 file changed, 33 insertions(+), 23 deletions(-)

diff --git a/manifests/sahara.pp b/manifests/sahara.pp
index c17d37527..fb9417be4 100644
--- a/manifests/sahara.pp
+++ b/manifests/sahara.pp
@@ -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::params
@@ -48,29 +56,31 @@ class openstack_integration::sahara {
   class { '::sahara::client': }
   class { '::sahara::notify': }
 
-  # create simple sahara templates
-  sahara_node_group_template { 'master':
-    ensure         => present,
-    plugin         => 'vanilla',
-    plugin_version => '2.7.1',
-    flavor         => 'm1.micro',
-    node_processes => [ 'namenode', 'resourcemanager' ],
-  }
+  if $integration_enable {
+    # create simple sahara templates
+    sahara_node_group_template { 'master':
+      ensure         => present,
+      plugin         => 'vanilla',
+      plugin_version => '2.7.1',
+      flavor         => 'm1.micro',
+      node_processes => [ 'namenode', 'resourcemanager' ],
+    }
 
-  sahara_node_group_template { 'worker':
-    ensure         => present,
-    plugin         => 'vanilla',
-    plugin_version => '2.7.1',
-    flavor         => 'm1.micro',
-    node_processes => [ 'datanode', 'nodemanager' ],
-  }
+    sahara_node_group_template { 'worker':
+      ensure         => present,
+      plugin         => 'vanilla',
+      plugin_version => '2.7.1',
+      flavor         => 'm1.micro',
+      node_processes => [ 'datanode', 'nodemanager' ],
+    }
 
-  sahara_cluster_template { 'cluster':
-    ensure      => present,
-    node_groups => [ 'master:1', 'worker:2' ]
-  }
+    sahara_cluster_template { 'cluster':
+      ensure      => present,
+      node_groups => [ 'master:1', 'worker:2' ]
+    }
 
-  Nova_flavor<||> -> Sahara_node_group_template<||>
-  Class['::sahara::keystone::auth'] -> Sahara_node_group_template<||>
-  Class['::openstack_extras::auth_file'] -> Sahara_node_group_template<||>
+    Nova_flavor<||> -> Sahara_node_group_template<||>
+    Class['::sahara::keystone::auth'] -> Sahara_node_group_template<||>
+    Class['::openstack_extras::auth_file'] -> Sahara_node_group_template<||>
+  }
 }