Merge pull request #9 from cristifalcas/test

add support to use forward-journald. This should fix SIGPIPE's sent to the daemon

README.md

@@ -12,7 +12,7 @@ Because of the way etcd is working, you can't change any of the initial cluster
     initial_cluster_state
     initial_cluster_token
 
-This is annoyng if you first bootstraped the cluster in http mode and you want to add ssl after that to initial_cluster parameter.
+This is annoying if you first bootstraped the cluster in http mode and you want to add ssl after that to initial_cluster parameter.
 
 Solution:
 * Don't care. Even if the protocol is http, the communication will be over ssl
@@ -149,3 +149,11 @@ checking if $::fqdn or $::ipaddress appears in initial_cluster parameter.
       peer_trusted_ca_file        => '/etc/pki/puppet_certs/etcd/ca_cert.pem',
       debug     => true,
     }
+
+## Journald forward:
+
+The class support a parameter called journald_forward_enable.
+
+This was added because of the PIPE signal that is sent to go programs when systemd-journald dies.
+
+For more information read here: https://github.com/projectatomic/forward-journald

manifests/config.pp

@@ -5,4 +5,24 @@
     ensure  => 'file',
     content => template("${module_name}/etc/etcd/etcd.conf.erb"),
   }
+
+  if $::etcd::manage_package and $::etcd::journald_forward_enable and $::operatingsystemmajrelease == 7 {
+    file { '/etc/systemd/system/etcd.service.d':
+      ensure => 'directory',
+      owner  => 'root',
+      group  => 'root',
+      mode   => '0755',
+    }
+    file { '/etc/systemd/system/etcd.service.d/journald.conf':
+      ensure  => file,
+      owner   => 'root',
+      group   => 'root',
+      mode    => '0644',
+      content => template("${module_name}/journald.conf.erb"),
+    } ~>
+    exec { 'systemctl-daemon-reload etcd_service':
+      refreshonly => true,
+      command     => '/usr/bin/systemctl/systemctl daemon-reload',
+    }
+  }
 }

manifests/init.pp

@@ -198,6 +198,9 @@
 #   Set individual etcd subpackages to specific log levels. An example being etcdserver=WARNING,security=DEBUG
 #   default: none (INFO for all packages)
 #
+# [*journald_forward_enable*]
+#   Enable log forwarding via journald_forward_enable
+#
 class etcd (
   $ensure                      = $etcd::params::ensure,
   $manage_package              = $etcd::params::manage_package,
@@ -247,6 +250,7 @@
   # logging
   $debug                       = $etcd::params::debug,
   $log_package_levels          = $etcd::params::log_package_levels,
+  $journald_forward_enable     = $etcd::params::journald_forward_enable
 ) inherits etcd::params {
   validate_integer([
     $snapshot_counter,
@@ -260,7 +264,7 @@
     $proxy_write_timeout,
     $proxy_read_timeout,
     ])
-  validate_bool($strict_reconfig_check, $client_cert_auth, $peer_client_cert_auth, $debug)
+  validate_bool($strict_reconfig_check, $client_cert_auth, $peer_client_cert_auth, $debug, $journald_forward_enable)
   validate_re($initial_cluster_state, '^(new|existing)$')
   validate_re($discovery_fallback, '^(proxy|exit)$')
   validate_absolute_path($data_dir)

manifests/params.pp

@@ -68,4 +68,6 @@
   # logging
   $debug = false
   $log_package_levels = undef
+
+  $journald_forward_enable = false
 }

metadata.json

@@ -1,6 +1,6 @@
 {
 	"name": "cristifalcas-etcd",
-	"version": "1.3.0",
+	"version": "1.5.0",
 	"author": "Cristian Falcas",
 	"summary": "Installs and configures etcd",
 	"license": "Apache-2.0",

templates/journald.conf.erb

@@ -0,0 +1,7 @@
+[Service]
+NotifyAccess=all
+Type=notify
+ExecStart=
+ExecStart=-/bin/bash -c "GOMAXPROCS=$(nproc) /usr/bin/etcd --name=\"${ETCD_NAME}\" --data-dir=\"${ETCD_DATA_DIR}\" --listen-client-urls=\"${ETCD_LISTEN_CLIENT_URLS}\" 2>&1 | /usr/bin/forward-journald -tag etcd"
+StandardOutput=null
+StandardError=null