summaryrefslogtreecommitdiffstats
path: root/puppet/services/README.rst
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-09-09 09:20:21 +0000
committerGerrit Code Review <review@openstack.org>2016-09-09 09:20:21 +0000
commit56486057c7c242745a4d44df5a03947ef49b49e7 (patch)
tree91fb619e390d84a924e93b4bb81ac536cf88c433 /puppet/services/README.rst
parent27c38e3784973ce368e1213daef0061a5f8ae503 (diff)
parent7aeb416528df98f3e5ba0dda8878f7b9c6bb55ec (diff)
Merge "Add global_config_settings to services' output"
Diffstat (limited to 'puppet/services/README.rst')
-rw-r--r--puppet/services/README.rst2
1 files changed, 2 insertions, 0 deletions
diff --git a/puppet/services/README.rst b/puppet/services/README.rst
index 15c8c1f1..8fe51fa3 100644
--- a/puppet/services/README.rst
+++ b/puppet/services/README.rst
@@ -31,6 +31,8 @@ are re-asserted when applying latter ones.
* config_settings: Custom hiera settings for this service.
+ * global_config_settings: Additional hiera settings distributed to all roles.
+
* step_config: A puppet manifest that is used to step through the deployment
sequence. Each sequence is given a "step" (via hiera('step') that provides
information for when puppet classes should activate themselves.