diff --git a/sahara/tests/integration/configs/config.py b/sahara/tests/integration/configs/config.py index 2b51091e22..f310f24cd8 100644 --- a/sahara/tests/integration/configs/config.py +++ b/sahara/tests/integration/configs/config.py @@ -339,6 +339,17 @@ HDP_CONFIG_OPTS = [ cfg.StrOpt('SSH_USERNAME', default=None, help='Username to get cluster node with SSH.'), + cfg.ListOpt('MASTER_NODE_PROCESSES', + default=['JOBTRACKER', 'NAMENODE', 'SECONDARY_NAMENODE', + 'GANGLIA_SERVER', 'NAGIOS_SERVER', + 'AMBARI_SERVER', 'OOZIE_SERVER'], + help='A list of processes that will be launched ' + 'on master node'), + cfg.ListOpt('WORKER_NODE_PROCESSES', + default=['TASKTRACKER', 'DATANODE', 'HDFS_CLIENT', + 'MAPREDUCE_CLIENT', 'OOZIE_CLIENT', 'PIG'], + help='A list of processes that will be launched ' + 'on worker nodes'), cfg.StrOpt('HADOOP_VERSION', default='1.3.2', help='Version of Hadoop.'), diff --git a/sahara/tests/integration/configs/itest.conf.sample-full b/sahara/tests/integration/configs/itest.conf.sample-full index 4ce5e8b76f..51cef8c9f7 100644 --- a/sahara/tests/integration/configs/itest.conf.sample-full +++ b/sahara/tests/integration/configs/itest.conf.sample-full @@ -200,6 +200,11 @@ # Username to get cluster node with SSH (string value) #SSH_USERNAME = +# A list of processes that will be launched on master node (list value) +#MASTER_NODE_PROCESSES = JOBTRACKER, NAMENODE, SECONDARY_NAMENODE, GANGLIA_SERVER, NAGIOS_SERVER, AMBARI_SERVER, OOZIE_SERVER + +# A list of processes that will be launched on worker nodes (list value) +#WORKER_NODE_PROCESSES = TASKTRACKER, DATANODE, HDFS_CLIENT, MAPREDUCE_CLIENT, OOZIE_CLIENT, PIG # Version of Hadoop (string value) #HADOOP_VERSION = '1.3.2' @@ -217,10 +222,10 @@ # (string value) #HADOOP_LOG_DIRECTORY_ON_VOLUME = '/volumes/disk1/hadoop/mapred/userlogs' -#The number of hosts to add while scaling an existing node group +# The number of hosts to add while scaling an existing node group #SCALE_EXISTING_NG_COUNT = 1 -#The number of hosts to add while scaling a new node group +# The number of hosts to add while scaling a new node group #SCALE_NEW_NG_COUNT = 1 # (dictionary value) diff --git a/sahara/tests/integration/tests/gating/test_hdp_gating.py b/sahara/tests/integration/tests/gating/test_hdp_gating.py index a1df6a980e..4698736cf0 100644 --- a/sahara/tests/integration/tests/gating/test_hdp_gating.py +++ b/sahara/tests/integration/tests/gating/test_hdp_gating.py @@ -71,8 +71,7 @@ class HDPGatingTest(cinder.CinderVolumeTest, edp.EDPTest, description='test node group template for HDP plugin', volumes_per_node=volumes_per_node, volume_size=volume_size, - node_processes=['TASKTRACKER', 'DATANODE', 'HDFS_CLIENT', - 'MAPREDUCE_CLIENT', 'OOZIE_CLIENT', 'PIG'], + node_processes=self.hdp_config.WORKER_NODE_PROCESSES, node_configs={}, floating_ip_pool=floating_ip_pool ) @@ -96,10 +95,7 @@ class HDPGatingTest(cinder.CinderVolumeTest, edp.EDPTest, dict( name='master-node-jt-nn', flavor_id=self.flavor_id, - node_processes=[ - 'JOBTRACKER', 'NAMENODE', 'SECONDARY_NAMENODE', - 'GANGLIA_SERVER', 'NAGIOS_SERVER', - 'AMBARI_SERVER', 'OOZIE_SERVER'], + node_processes=self.hdp_config.MASTER_NODE_PROCESSES, node_configs={}, floating_ip_pool=floating_ip_pool, count=1),