Filippo Giunchedi has uploaded a new change for review. https://gerrit.wikimedia.org/r/190813
Change subject: cassandra: deprecate cassandra::defaults class ...................................................................... cassandra: deprecate cassandra::defaults class to correctly use hiera (and thus proceed with T89657) we should get rid of cassandra::defaults class altogether. Bug: T76149 Change-Id: I2459fa4378e63d9f9fcbd93785a5db5a627c548a --- D manifests/defaults.pp M manifests/init.pp 2 files changed, 37 insertions(+), 98 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/operations/puppet/cassandra refs/changes/13/190813/1 diff --git a/manifests/defaults.pp b/manifests/defaults.pp deleted file mode 100644 index 56a0b40..0000000 --- a/manifests/defaults.pp +++ /dev/null @@ -1,60 +0,0 @@ -class cassandra::defaults { - $seeds = pick($::cassandra_seeds, [$::ipaddress]) - $cluster_name = pick($::cassandra_cluster_name, 'Test Cluster') - $num_tokens = pick($::cassandra_num_tokens, 256) - $authenticator = pick($::cassandra_authenticator, true) - $authorizor = pick($::cassandra_authorizor, true) - $data_file_directories = pick($::cassandra_data_file_directories, ['/var/lib/cassandra/data']) - $commitlog_directory = pick($::cassandra_commitlog_directory, '/var/lib/cassandra/commitlog') - $disk_failure_policy = pick($::cassandra_disk_failure_policy, 'stop') - $row_cache_size_in_mb = pick($::cassandra_row_cache_size_in_mb, 200) - $memory_allocator = pick($::cassandra_memory_allocator, 'JEMallocAllocator') - $saved_caches_directory = pick($::cassandra_saved_caches_directory, '/var/lib/cassandra/saved_caches') - $concurrent_reads = pick($::cassandra_concurrent_reads, 32) - $concurrent_writes = pick($::cassandra_concurrent_writes, 32) - $concurrent_counter_writes = pick($::cassandra_concurrent_counter_writes, 32) - $storage_port = pick($::cassandra_storage_port, 7000) - $listen_address = pick($::cassandra_listen_address, $::ipaddress) - - # Since the default here is undef, we can't use stdlib's pick(). - $broadcast_address = $::cassandra_broadcast_address ? { - undef => undef, - default => $::cassandra_broadcast_address, - } - - $start_native_transport = pick($::cassandra_start_native_transport, 'true') - $native_transport_port = pick($::cassandra_native_transport_port, 9042) - $start_rpc = pick($::cassandra_start_rpc, 'true') - $rpc_address = pick($::cassandra_rpc_address, $::ipaddress) - $rpc_port = pick($::cassandra_rpc_port, 9160) - $rpc_server_type = pick($::cassandra_rpc_server_type, 'sync') - $incremental_backups = pick($::cassandra_incremental_backups, 'false') - $snapshot_before_compaction = pick($::cassandra_snapshot_before_compaction, 'false') - $auto_snapshot = pick($::cassandra_auto_snapshot, 'true') - $compaction_throughput_mb_per_sec = pick($::cassandra_compaction_throughput_mb_per_sec, 16) - $endpoint_snitch = pick($::cassandra_endpoint_snitch, 'GossipingPropertyFileSnitch') - $internode_compression = pick($::cassandra_internode_compression, 'all') - - # Since the default here is undef, we can't use stdlib's pick(). - $max_heap_size = $::cassandra_max_heap_size ? { - undef => undef, - default => $::cassandra_max_heap_size, - } - $heap_newsize = $::cassandra_heap_newsize ? { - undef => undef, - default => $::cassandra_heap_newsize, - } - - $jmx_port = pick($::cassandra_jmx_port, 7199) - # Since the default here is an empty array we can't use stdlib's pick(). - $additional_jvm_opts = $::cassandra_additional_jvm_opts ? { - undef => [], - default => $::cassandra_additional_jvm_opts, - } - $dc = pick($::cassandra_dc, 'datacenter1') - $rack = pick($::cassandra_rack, 'rack1') - - $yaml_template = pick($::cassandra_yaml_template, "${module}/cassandra.yaml.erb") - $env_template = pick($::cassandra_env_template, "${module}/cassandra-env.sh.erb") - $rackdc_template = pick($::cassandra_rackdc_template, "${module}/cassandra-rackdc.properties.erb") -} diff --git a/manifests/init.pp b/manifests/init.pp index 6e4d327..1eb4ce8 100644 --- a/manifests/init.pp +++ b/manifests/init.pp @@ -165,45 +165,44 @@ # Default rack1 # class cassandra( - $cluster_name = $cassandra::defaults::cluster_name, - $seeds = $cassandra::defaults::seeds, - $num_tokens = $cassandra::defaults::num_tokens, - $authenticator = $cassandra::defaults::authenticator, - $authorizor = $cassandra::defaults::authorizor, - $data_file_directories = $cassandra::defaults::data_file_directories, - $commitlog_directory = $cassandra::defaults::commitlog_directory, - $disk_failure_policy = $cassandra::defaults::disk_failure_policy, - $memory_allocator = $cassandra::defaults::memory_allocator, - $saved_caches_directory = $cassandra::defaults::saved_caches_directory, - $concurrent_reads = $cassandra::defaults::concurrent_reads, - $concurrent_writes = $cassandra::defaults::concurrent_writes, - $storage_port = $cassandra::defaults::storage_port, - $listen_address = $cassandra::defaults::listen_address, - $broadcast_address = $cassandra::defaults::broadcast_address, - $start_native_transport = $cassandra::defaults::start_native_transport, - $native_transport_port = $cassandra::defaults::native_transport_port, - $start_rpc = $cassandra::defaults::start_rpc, - $rpc_address = $cassandra::defaults::rpc_address, - $rpc_port = $cassandra::defaults::rpc_port, - $rpc_server_type = $cassandra::defaults::rpc_server_type, - $incremental_backups = $cassandra::defaults::incremental_backups, - $snapshot_before_compaction = $cassandra::defaults::snapshot_before_compaction, - $auto_snapshot = $cassandra::defaults::auto_snapshot, - $compaction_throughput_mb_per_sec = $cassandra::defaults::compaction_throughput_mb_per_sec, - $endpoint_snitch = $cassandra::defaults::endpoint_snitch, - $internode_compression = $cassandra::defaults::internode_compression, - $max_heap_size = $cassandra::defaults::max_heap_size, - $heap_newsize = $cassandra::defaults::heap_newsize, - $jmx_port = $cassandra::defaults::jmx_port, - $additional_jvm_opts = $cassandra::defaults::additional_jvm_opts, - $dc = $cassandra::defaults::dc, - $rack = $cassandra::defaults::rack, + $cluster_name = 'Test Cluster', + $seeds = [$::ipaddress], + $num_tokens = 256, + $authenticator = true, + $authorizor = true, + $data_file_directories = ['/var/lib/cassandra/data'], + $commitlog_directory = '/var/lib/cassandra/commitlog', + $disk_failure_policy = 'stop', + $memory_allocator = 'JEMallocAllocator', + $saved_caches_directory = '/var/lib/cassandra/saved_caches', + $concurrent_reads = 32, + $concurrent_writes = 32, + $storage_port = 7000, + $listen_address = $::ipaddress, + $broadcast_address = undef, + $start_native_transport = 'true', + $native_transport_port = 9042, + $start_rpc = 'true', + $rpc_address = $::ipaddress, + $rpc_port = 9160, + $rpc_server_type = 'sync', + $incremental_backups = 'false', + $snapshot_before_compaction = 'false', + $auto_snapshot = 'true', + $compaction_throughput_mb_per_sec = 16, + $endpoint_snitch = 'GossipingPropertyFileSnitch', + $internode_compression = 'all', + $max_heap_size = undef, + $heap_newsize = undef, + $jmx_port = 7199, + $additional_jvm_opts = undef, + $dc = 'datacenter1', + $rack = 'rack1', - $yaml_template = $cassandra::defaults::cassandra_yaml_template, - $env_template = $cassandra::defaults::cassandra_env_template, - $rackdc_template = $cassandra::defaults::cassandra_rackdc_template -) inherits cassandra::defaults -{ + $yaml_template = "${module}/cassandra.yaml.erb", + $env_template = "${module}/cassandra-env.sh.erb", + $rackdc_template = "${module}/cassandra-rackdc.properties.erb", +) { validate_string($cluster_name) validate_absolute_path($commitlog_directory) -- To view, visit https://gerrit.wikimedia.org/r/190813 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2459fa4378e63d9f9fcbd93785a5db5a627c548a Gerrit-PatchSet: 1 Gerrit-Project: operations/puppet/cassandra Gerrit-Branch: master Gerrit-Owner: Filippo Giunchedi <fgiunch...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits