Update Sahara templates to Kilo version
Current Sahara templates are deprecated and need to update them. Change-Id: I3c372732609abfbe988ce61373dd5cbecb84280f Closes-bug: #1476324
This commit is contained in:
Denis Egorenko
parent
1a50c1060b
commit
52fde17ce4
|
|
@ -58,6 +58,7 @@ class { 'sahara' :
|
|||
verbose => $verbose,
|
||||
debug => $debug,
|
||||
use_syslog => $use_syslog,
|
||||
plugins => [ 'ambari', 'cdh', 'mapr', 'spark', 'vanilla' ],
|
||||
log_facility => $syslog_log_facility_sahara,
|
||||
database_connection => $sql_connection,
|
||||
auth_uri => "${public_protocol}://${public_address}:5000/v2.0/",
|
||||
|
|
@ -99,18 +100,17 @@ haproxy_backend_status { 'sahara' :
|
|||
url => $haproxy_stats_url,
|
||||
}
|
||||
|
||||
# Temporarily disable as workaround for bug 1476324
|
||||
#if $primary_controller {
|
||||
# class { 'sahara_templates::create_templates' :
|
||||
# use_neutron => $use_neutron,
|
||||
# auth_user => $access_admin['user'],
|
||||
# auth_password => $access_admin['password'],
|
||||
# auth_tenant => $access_admin['tenant'],
|
||||
# auth_uri => "${public_protocol}://${public_address}:5000/v2.0/",
|
||||
# }
|
||||
#
|
||||
# Haproxy_backend_status['sahara'] -> Class['sahara_templates::create_templates']
|
||||
#}
|
||||
if $primary_controller {
|
||||
class { 'sahara_templates::create_templates' :
|
||||
use_neutron => $use_neutron,
|
||||
auth_user => $access_admin['user'],
|
||||
auth_password => $access_admin['password'],
|
||||
auth_tenant => $access_admin['tenant'],
|
||||
auth_uri => "${public_protocol}://${public_address}:5000/v2.0/",
|
||||
}
|
||||
|
||||
Haproxy_backend_status['sahara'] -> Class['sahara_templates::create_templates']
|
||||
}
|
||||
|
||||
Firewall[$firewall_rule] -> Class['sahara::api']
|
||||
Service['sahara-api'] -> Haproxy_backend_status['sahara']
|
||||
|
|
|
|||
|
|
@ -40,7 +40,7 @@ class sahara_templates::create_templates (
|
|||
"oozie",
|
||||
"historyserver"
|
||||
],
|
||||
hadoop_version => '2.4.1',
|
||||
hadoop_version => '2.6.0',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
|
|
@ -49,18 +49,18 @@ class sahara_templates::create_templates (
|
|||
plugin_name => 'vanilla',
|
||||
flavor_id => 'm1.medium',
|
||||
node_processes => ['datanode', 'nodemanager'],
|
||||
hadoop_version => '2.4.1',
|
||||
hadoop_version => '2.6.0',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_cluster_template { 'vanilla-2' :
|
||||
description => 'The upstream Apache Hadoop 2.4.1 cluster with master and 3 worker nodes. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
description => 'The upstream Apache Hadoop 2.6.0 cluster with master and 3 worker nodes. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
plugin_name => 'vanilla',
|
||||
node_groups => [
|
||||
{'name' => 'vanilla-2-master', 'count' => 1},
|
||||
{'name' => 'vanilla-2-worker', 'count' => 3}
|
||||
],
|
||||
hadoop_version => '2.4.1',
|
||||
hadoop_version => '2.6.0',
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'cdh-5-master' :
|
||||
|
|
@ -68,13 +68,13 @@ class sahara_templates::create_templates (
|
|||
plugin_name => 'cdh',
|
||||
flavor_id => 'm1.large',
|
||||
node_processes => [
|
||||
"NAMENODE",
|
||||
"SECONDARYNAMENODE",
|
||||
"RESOURCEMANAGER",
|
||||
"JOBHISTORY",
|
||||
"HDFS_NAMENODE",
|
||||
"HDFS_SECONDARYNAMENODE",
|
||||
"YARN_RESOURCEMANAGER",
|
||||
"YARN_JOBHISTORY",
|
||||
"OOZIE_SERVER"
|
||||
],
|
||||
hadoop_version => '5',
|
||||
hadoop_version => '5.4.0',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
|
|
@ -83,9 +83,9 @@ class sahara_templates::create_templates (
|
|||
plugin_name => 'cdh',
|
||||
flavor_id => 'm1.large',
|
||||
node_processes => [
|
||||
"MANAGER"
|
||||
"CLOUDERA_MANAGER"
|
||||
],
|
||||
hadoop_version => '5',
|
||||
hadoop_version => '5.4.0',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
|
|
@ -94,135 +94,62 @@ class sahara_templates::create_templates (
|
|||
plugin_name => 'cdh',
|
||||
flavor_id => 'm1.medium',
|
||||
node_processes => [
|
||||
"DATANODE",
|
||||
"NODEMANAGER"
|
||||
"HDFS_DATANODE",
|
||||
"YARN_NODEMANAGER"
|
||||
],
|
||||
hadoop_version => '5',
|
||||
hadoop_version => '5.4.0',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_cluster_template { 'cdh-5' :
|
||||
description => 'The Cloudera distribution of Apache Hadoop (CDH) 5.2.0 cluster with manager, master and 3 worker nodes. The manager node is dedicated to Cloudera Manager management console. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
description => 'The Cloudera distribution of Apache Hadoop (CDH) 5.4.0 cluster with manager, master and 3 worker nodes. The manager node is dedicated to Cloudera Manager management console. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
plugin_name => 'cdh',
|
||||
node_groups => [
|
||||
{'name' => 'cdh-5-master', 'count' => 1},
|
||||
{'name' => 'cdh-5-manager', 'count' => 1},
|
||||
{'name' => 'cdh-5-worker', 'count' => 3}
|
||||
],
|
||||
hadoop_version => '5',
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'hdp-2-0-master' :
|
||||
description => 'The master node contains all management Hadoop components like NameNode, HistoryServer and ResourceManager. It also includes Oozie server required to run Hadoop jobs.',
|
||||
plugin_name => 'hdp',
|
||||
flavor_id => 'm1.large',
|
||||
node_processes => [
|
||||
"NAMENODE",
|
||||
"SECONDARY_NAMENODE",
|
||||
"ZOOKEEPER_SERVER",
|
||||
"ZOOKEEPER_CLIENT",
|
||||
"HISTORYSERVER",
|
||||
"RESOURCEMANAGER",
|
||||
"OOZIE_SERVER"
|
||||
],
|
||||
hadoop_version => '2.0.6',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'hdp-2-0-manager' :
|
||||
description => 'The manager node is dedicated to Ambari 1.4.1 management console that provides UI to manage Hadoop cluster. The node also includes third party monitoring systems: Ganglia 3.5.0 and Nagios 3.5.0.',
|
||||
plugin_name => 'hdp',
|
||||
flavor_id => 'm1.large',
|
||||
node_processes => [
|
||||
"AMBARI_SERVER",
|
||||
"GANGLIA_SERVER",
|
||||
"NAGIOS_SERVER"
|
||||
],
|
||||
hadoop_version => '2.0.6',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'hdp-2-0-worker' :
|
||||
description => 'The worker node contains components that can be scaled by running more nodes. Each node includes everything required for data storage and processing.',
|
||||
plugin_name => 'hdp',
|
||||
flavor_id => 'm1.medium',
|
||||
node_processes => [
|
||||
"DATANODE",
|
||||
"HDFS_CLIENT",
|
||||
"ZOOKEEPER_CLIENT",
|
||||
"PIG",
|
||||
"MAPREDUCE2_CLIENT",
|
||||
"YARN_CLIENT",
|
||||
"NODEMANAGER",
|
||||
"OOZIE_CLIENT"
|
||||
],
|
||||
hadoop_version => '2.0.6',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_cluster_template { 'hdp-2-0' :
|
||||
description => 'Hortonworks Data Platform (HDP) 2.0.6 cluster with manager, master and 3 worker nodes. The manager node is dedicated to Ambari 1.4.1 management console. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
plugin_name => 'hdp',
|
||||
node_groups => [
|
||||
{'name' => 'hdp-2-0-master', 'count' => 1},
|
||||
{'name' => 'hdp-2-0-manager', 'count' => 1},
|
||||
{'name' => 'hdp-2-0-worker', 'count' => 3}
|
||||
],
|
||||
hadoop_version => '2.0.6',
|
||||
hadoop_version => '5.4.0',
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'hdp-2-2-master' :
|
||||
description => 'The master node contains all management Hadoop components like Ambari, NameNode, HistoryServer and ResourceManager. It also includes Oozie server required to run Hadoop jobs.',
|
||||
plugin_name => 'hdp',
|
||||
plugin_name => 'ambari',
|
||||
flavor_id => 'm1.large',
|
||||
node_processes => [
|
||||
"NAMENODE",
|
||||
"SECONDARY_NAMENODE",
|
||||
"ZOOKEEPER_SERVER",
|
||||
"AMBARI_SERVER",
|
||||
"HIVE_SERVER",
|
||||
"HIVE_METASTORE",
|
||||
"MYSQL_SERVER",
|
||||
"WEBHCAT_SERVER",
|
||||
"TEZ_CLIENT",
|
||||
"HISTORYSERVER",
|
||||
"RESOURCEMANAGER",
|
||||
"OOZIE_SERVER",
|
||||
"NAGIOS_SERVER",
|
||||
"GANGLIA_SERVER"
|
||||
"NameNode",
|
||||
"SecondaryNameNode",
|
||||
"ZooKeeper",
|
||||
"Ambari",
|
||||
"YARN Timeline Server",
|
||||
"MapReduce History Server",
|
||||
"ResourceManager",
|
||||
"Oozie"
|
||||
],
|
||||
hadoop_version => '2.2.0',
|
||||
hadoop_version => '2.2',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_node_group_template { 'hdp-2-2-worker' :
|
||||
description => 'The worker node contains components that can be scaled by running more nodes. Each node includes everything required for data storage and processing.',
|
||||
plugin_name => 'hdp',
|
||||
plugin_name => 'ambari',
|
||||
flavor_id => 'm1.medium',
|
||||
node_processes => [
|
||||
"DATANODE",
|
||||
"HDFS_CLIENT",
|
||||
"ZOOKEEPER_CLIENT",
|
||||
"HIVE_CLIENT",
|
||||
"PIG",
|
||||
"TEZ_CLIENT",
|
||||
"MAPREDUCE2_CLIENT",
|
||||
"YARN_CLIENT",
|
||||
"NODEMANAGER",
|
||||
"OOZIE_CLIENT"
|
||||
"DataNode",
|
||||
"NodeManager",
|
||||
],
|
||||
hadoop_version => '2.2.0',
|
||||
hadoop_version => '2.2',
|
||||
auto_security_group => true,
|
||||
}
|
||||
|
||||
sahara_cluster_template { 'hdp-2-2' :
|
||||
description => 'Hortonworks Data Platform (HDP) 2.2.0 cluster with manager, master and 4 worker nodes. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
plugin_name => 'hdp',
|
||||
description => 'Hortonworks Data Platform (HDP) 2.2 cluster with manager, master and 4 worker nodes. The master node contains all management Hadoop processes. Workers contain Hadoop processes for data storage and processing.',
|
||||
plugin_name => 'ambari',
|
||||
node_groups => [
|
||||
{'name' => 'hdp-2-2-master', 'count' => 1},
|
||||
{'name' => 'hdp-2-2-worker', 'count' => 4}
|
||||
],
|
||||
hadoop_version => '2.2.0',
|
||||
hadoop_version => '2.2',
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -30,6 +30,7 @@ describe manifest do
|
|||
api_bind_port = '8386'
|
||||
api_bind_host = internal_address
|
||||
api_workers = '4'
|
||||
sahara_plugins = [ 'ambari', 'cdh', 'mapr', 'spark', 'vanilla' ]
|
||||
if public_ssl
|
||||
public_address = Noop.hiera_structure('public_ssl/hostname')
|
||||
public_protocol = 'https'
|
||||
|
|
@ -51,6 +52,7 @@ describe manifest do
|
|||
should contain_class('sahara').with(
|
||||
'auth_uri' => "#{public_protocol}://#{public_address}:5000/v2.0/",
|
||||
'identity_uri' => "http://#{service_endpoint}:35357/",
|
||||
'plugins' => sahara_plugins,
|
||||
'rpc_backend' => 'rabbit',
|
||||
'use_neutron' => use_neutron,
|
||||
'admin_user' => sahara_user,
|
||||
|
|
@ -95,18 +97,17 @@ describe manifest do
|
|||
end
|
||||
end
|
||||
|
||||
# Temporarily disable as workaround for bug 1476324
|
||||
# if primary_controller
|
||||
# it 'should declare sahara_templates class correctly' do
|
||||
# should contain_class('sahara_templates::create_templates').with(
|
||||
# 'use_neutron' => use_neutron,
|
||||
# 'auth_uri' => "http://#{management_ip}:5000/v2.0/",
|
||||
# 'auth_password' => auth_password,
|
||||
# 'auth_user' => auth_user,
|
||||
# 'auth_tenant' => auth_tenant,
|
||||
# )
|
||||
# end
|
||||
# end
|
||||
if primary_controller
|
||||
it 'should declare sahara_templates class correctly' do
|
||||
should contain_class('sahara_templates::create_templates').with(
|
||||
'use_neutron' => use_neutron,
|
||||
'auth_uri' => "#{public_protocol}://#{public_address}:5000/v2.0/",
|
||||
'auth_password' => auth_password,
|
||||
'auth_user' => auth_user,
|
||||
'auth_tenant' => auth_tenant,
|
||||
)
|
||||
end
|
||||
end
|
||||
end
|
||||
test_ubuntu_and_centos manifest
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in New Issue