diff options
| author | OpenShift Bot <eparis+openshiftbot@redhat.com> | 2017-03-28 19:23:17 -0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-28 19:23:17 -0500 |
| commit | 1579cfed66e56af061fb3f761e50971daecba7f4 (patch) | |
| tree | c78a1db06da7134d17766d794cee5c6d6e9d8be6 | |
| parent | 89f2e49cbe7f61fa8379343552ae9862f926bbfb (diff) | |
| parent | d47ea8839b55e78d12de71f0a1bd7746262d6d71 (diff) | |
| download | openshift-1579cfed66e56af061fb3f761e50971daecba7f4.tar.gz openshift-1579cfed66e56af061fb3f761e50971daecba7f4.tar.bz2 openshift-1579cfed66e56af061fb3f761e50971daecba7f4.tar.xz openshift-1579cfed66e56af061fb3f761e50971daecba7f4.zip | |
Merge pull request #3782 from sdodson/etcd_debug
Merged by openshift-bot
| -rw-r--r-- | inventory/byo/hosts.origin.example | 4 | ||||
| -rw-r--r-- | inventory/byo/hosts.ose.example | 4 | ||||
| -rw-r--r-- | roles/etcd/templates/etcd.conf.j2 | 6 |
3 files changed, 14 insertions, 0 deletions
diff --git a/inventory/byo/hosts.origin.example b/inventory/byo/hosts.origin.example index 033ce8a82..7e58eb543 100644 --- a/inventory/byo/hosts.origin.example +++ b/inventory/byo/hosts.origin.example @@ -91,6 +91,10 @@ openshift_release=v1.5 # Specify exact version of etcd to configure or upgrade to. # etcd_version="3.1.0" +# Enable etcd debug logging, defaults to false +# etcd_debug=true +# Set etcd log levels by package +# etcd_log_package_levels="etcdserver=WARNING,security=DEBUG" # Upgrade Hooks # diff --git a/inventory/byo/hosts.ose.example b/inventory/byo/hosts.ose.example index 49bcb7405..3002feac2 100644 --- a/inventory/byo/hosts.ose.example +++ b/inventory/byo/hosts.ose.example @@ -91,6 +91,10 @@ openshift_release=v3.5 # Specify exact version of etcd to configure or upgrade to. # etcd_version="3.1.0" +# Enable etcd debug logging, defaults to false +# etcd_debug=true +# Set etcd log levels by package +# etcd_log_package_levels="etcdserver=WARNING,security=DEBUG" # Upgrade Hooks # diff --git a/roles/etcd/templates/etcd.conf.j2 b/roles/etcd/templates/etcd.conf.j2 index 990a86c21..9151dd0bd 100644 --- a/roles/etcd/templates/etcd.conf.j2 +++ b/roles/etcd/templates/etcd.conf.j2 @@ -60,3 +60,9 @@ ETCD_PEER_CA_FILE={{ etcd_peer_ca_file }} ETCD_PEER_CERT_FILE={{ etcd_peer_cert_file }} ETCD_PEER_KEY_FILE={{ etcd_peer_key_file }} {% endif -%} + +#[logging] +ETCD_DEBUG="{{ etcd_debug | default(false) | string }}" +{% if etcd_log_package_levels is defined %} +ETCD_LOG_PACKAGE_LEVELS="{{ etcd_log_package_levels }}" +{% endif %} |