Skip to content

Commit

Permalink
Changes templates to use scope
Browse files Browse the repository at this point in the history 
* No longer need to re-scope them to the config class
* Use scope lookup for variables
* https://docs.puppet.com/puppet/latest/reference/lang_template_erb.html#scopevariable-or-scopelookupvarvariable
  • Loading branch information
@petems
petems committed Oct 14, 2016
1 parent 8273115 commit d886880
Show file tree
Hide file tree
Showing 4 changed files with 84 additions and 147 deletions.
63 changes: 0 additions & 63 deletions manifests/config.pp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -3,69 +3,6 @@
# This class provides configuration for Redis.
#
class redis::config {
$activerehashing = $::redis::activerehashing
$aof_load_truncated = $::redis::aof_load_truncated
$aof_rewrite_incremental_fsync = $::redis::aof_rewrite_incremental_fsync
$appendfilename = $::redis::appendfilename
$appendfsync = $::redis::appendfsync
$appendonly = $::redis::appendonly
$auto_aof_rewrite_min_size = $::redis::auto_aof_rewrite_min_size
$auto_aof_rewrite_percentage = $::redis::auto_aof_rewrite_percentage
$bind = $::redis::bind
$cluster_config_file = $::redis::cluster_config_file
$cluster_enabled = $::redis::cluster_enabled
$cluster_node_timeout = $::redis::cluster_node_timeout
$daemonize = $::redis::daemonize
$databases = $::redis::databases
$dbfilename = $::redis::dbfilename
$extra_config_file = $::redis::extra_config_file
$hash_max_ziplist_entries = $::redis::hash_max_ziplist_entries
$hash_max_ziplist_value = $::redis::hash_max_ziplist_value
$hll_sparse_max_bytes = $::redis::hll_sparse_max_bytes
$hz = $::redis::hz
$latency_monitor_threshold = $::redis::latency_monitor_threshold
$list_max_ziplist_entries = $::redis::list_max_ziplist_entries
$list_max_ziplist_value = $::redis::list_max_ziplist_value
$log_file = $::redis::log_file
$log_level = $::redis::log_level
$masterauth = $::redis::masterauth
$maxclients = $::redis::maxclients
$maxmemory = $::redis::maxmemory
$maxmemory_policy = $::redis::maxmemory_policy
$maxmemory_samples = $::redis::maxmemory_samples
$min_slaves_max_lag = $::redis::min_slaves_max_lag
$min_slaves_to_write = $::redis::min_slaves_to_write
$no_appendfsync_on_rewrite = $::redis::no_appendfsync_on_rewrite
$notify_keyspace_events = $::redis::notify_keyspace_events
$pid_file = $::redis::pid_file
$port = $::redis::port
$rdbcompression = $::redis::rdbcompression
$repl_backlog_size = $::redis::repl_backlog_size
$repl_backlog_ttl = $::redis::repl_backlog_ttl
$repl_disable_tcp_nodelay = $::redis::repl_disable_tcp_nodelay
$repl_ping_slave_period = $::redis::repl_ping_slave_period
$repl_timeout = $::redis::repl_timeout
$requirepass = $::redis::requirepass
$save_db_to_disk = $::redis::save_db_to_disk
$save_db_to_disk_interval = $::redis::save_db_to_disk_interval
$set_max_intset_entries = $::redis::set_max_intset_entries
$slave_priority = $::redis::slave_priority
$slave_read_only = $::redis::slave_read_only
$slave_serve_stale_data = $::redis::slave_serve_stale_data
$slaveof = $::redis::slaveof
$slowlog_log_slower_than = $::redis::slowlog_log_slower_than
$slowlog_max_len = $::redis::slowlog_max_len
$stop_writes_on_bgsave_error = $::redis::stop_writes_on_bgsave_error
$syslog_enabled = $::redis::syslog_enabled
$syslog_facility = $::redis::syslog_facility
$tcp_backlog = $::redis::tcp_backlog
$tcp_keepalive = $::redis::tcp_keepalive
$timeout = $::redis::timeout
$unixsocket = $::redis::unixsocket
$unixsocketperm = $::redis::unixsocketperm
$workdir = $::redis::workdir
$zset_max_ziplist_entries = $::redis::zset_max_ziplist_entries
$zset_max_ziplist_value = $::redis::zset_max_ziplist_value

if $::redis::notify_service {
File {
Expand Down
34 changes: 17 additions & 17 deletions templates/redis-sentinel.conf.erb
View file
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
<% if @sentinel_bind -%>
bind <%= @sentinel_bind %>
<% if scope['redis::sentinel::sentinel_bind']-%>
bind <%= scope['redis::sentinel::sentinel_bind'] %>
<% end -%>
port <%= @sentinel_port %>
dir <%= @working_dir %>
<% if @daemonize -%>daemonize yes<% else -%>daemonize no<% end %>
pidfile <%= @pid_file %>
port <%= scope['redis::sentinel::sentinel_port'] %>
dir <%= scope['redis::sentinel::working_dir'] %>
<% if scope['redis::sentinel::daemonize'] -%>daemonize yes<% else -%>daemonize no<% end %>
pidfile <%= scope['redis::sentinel::pid_file'] %>

sentinel monitor <%= @master_name %> <%= @redis_host %> <%= @redis_port %> <%= @quorum %>
sentinel down-after-milliseconds <%= @master_name %> <%= @down_after %>
sentinel parallel-syncs <%= @master_name %> <%= @parallel_sync %>
sentinel failover-timeout <%= @master_name %> <%= @failover_timeout %>
<% if @auth_pass -%>
sentinel auth-pass <%= @master_name %> <%= @auth_pass %>
sentinel monitor <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::redis_host'] %> <%= scope['redis::sentinel::redis_port'] %> <%= scope['redis::sentinel::quorum'] %>
sentinel down-after-milliseconds <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::down_after'] %>
sentinel parallel-syncs <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::parallel_sync'] %>
sentinel failover-timeout <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::failover_timeout'] %>
<% if scope['redis::sentinel::auth_pass']-%>
sentinel auth-pass <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::auth_pass'] %>
<% end -%>
<% if @notification_script -%>
sentinel notification-script <%= @master_name %> <%= @notification_script %>
<% if scope['redis::sentinel::notification_script']-%>
sentinel notification-script <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::notification_script'] %>
<% end -%>
<% if @client_reconfig_script -%>
sentinel client-reconfig-script <%= @master_name %> <%= @client_reconfig_script %>
<% if scope['redis::sentinel::client_reconfig_script']-%>
sentinel client-reconfig-script <%= scope['redis::sentinel::master_name'] %> <%= scope['redis::sentinel::client_reconfig_script'] %>
<% end -%>

logfile <%= @log_file %>
logfile <%= scope['redis::sentinel::log_file'] %>
6 changes: 3 additions & 3 deletions templates/redis-sentinel.init.erb
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@

PATH=/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin
DAEMON=/usr/bin/redis-sentinel
DAEMON_ARGS=<%= @config_file %>
DAEMON_ARGS=<%= scope['redis::config_file'] %>
NAME=redis-sentinel
DESC=redis-senitnel

Expand All @@ -37,15 +37,15 @@ case "$1" in
echo -n "Starting $DESC: "
mkdir -p $RUNDIR
touch $PIDFILE
chown <%= @service_user %>:<%= @service_group %> $RUNDIR $PIDFILE
chown <%= scope['redis::service_user'] %>:<%= scope['redis::service_group'] %> $RUNDIR $PIDFILE
chmod 755 $RUNDIR

if [ -n "$ULIMIT" ]
then
ulimit -n $ULIMIT
fi

if start-stop-daemon --start --quiet --umask 007 --pidfile $PIDFILE --chuid <%= @service_user %>:<%= @service_group %> --exec $DAEMON -- $DAEMON_ARGS
if start-stop-daemon --start --quiet --umask 007 --pidfile $PIDFILE --chuid <%= scope['redis::service_user'] %>:<%= scope['redis::service_group'] %> --exec $DAEMON -- $DAEMON_ARGS
then
echo "$NAME."
else
Expand Down
Loading

0 comments on commit d886880

Please sign in to comment.