diff options
| author | Roman Podoliaka <rpodolyaka@mirantis.com> | 2017-01-23 18:01:40 +0200 |
|---|---|---|
| committer | Roman Podoliaka <rpodolyaka@mirantis.com> | 2017-01-23 18:04:11 +0200 |
| commit | 5d4fd50facbbec8f4e2c0dda73b96ced4bd8deff (patch) | |
| tree | b50aefc688037a90eb22ad47f287e4b9eb279407 | |
| parent | 93aec6a99fdb586970f4381f5510ae100ba875e4 (diff) | |
| download | osprofiler-5d4fd50facbbec8f4e2c0dda73b96ced4bd8deff.tar.gz | |
devstack: make option hmac_keys configurable
Let the Devstack users override the default value of option
`hmac_keys` by the means of the environment variable set in
local.conf.
Change-Id: I0241abc4129f2d0130246723b78c584d448870a2
| -rw-r--r-- | devstack/README.rst | 7 | ||||
| -rw-r--r-- | devstack/lib/osprofiler | 2 | ||||
| -rw-r--r-- | devstack/settings | 5 |
3 files changed, 13 insertions, 1 deletions
diff --git a/devstack/README.rst b/devstack/README.rst index eaa6436..31c3f11 100644 --- a/devstack/README.rst +++ b/devstack/README.rst @@ -14,6 +14,13 @@ To configure DevStack to enable OSProfiler edit to the ``[[local|localrc]]`` section. +One can also configure a set of HMAC secrets, that are used for triggering of +profiling in OpenStack services: only the requests that specify one of these +keys in HTTP headers will be profiled. E.g. multiple secrets are specified as +a comma-separated list of string values:: + + OSPROFILER_HMAC_KEYS=swordfish,foxtrot,charlie + .. note:: The order of enabling plugins matter. Run DevStack as normal:: diff --git a/devstack/lib/osprofiler b/devstack/lib/osprofiler index 732550b..8c72b58 100644 --- a/devstack/lib/osprofiler +++ b/devstack/lib/osprofiler @@ -50,7 +50,7 @@ function configure_osprofiler() { then iniset $conf profiler enabled True iniset $conf profiler trace_sqlalchemy True - iniset $conf profiler hmac_keys SECRET_KEY + iniset $conf profiler hmac_keys $OSPROFILER_HMAC_KEYS fi done CEILOMETER_CONF=/etc/ceilometer/ceilometer.conf diff --git a/devstack/settings b/devstack/settings index dc01705..ac689c9 100644 --- a/devstack/settings +++ b/devstack/settings @@ -1,3 +1,8 @@ # Devstack settings +# A comma-separated list of secrets, that will be used for triggering +# of profiling in OpenStack services: profiling is only performed for +# requests that specify one of these keys in HTTP headers. +OSPROFILER_HMAC_KEYS=${OSPROFILER_HMAC_KEYS:-"SECRET_KEY"} + enable_service osprofiler |