From 7aeb416528df98f3e5ba0dda8878f7b9c6bb55ec Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Fri, 1 Jul 2016 14:45:31 +0200 Subject: Add global_config_settings to services' output The new global_config_settings output is meant to contain additional hieradata distributed by the services to all role types. Change-Id: I1beff8f7b12a4178e6081de6134cd8e67794d710 --- puppet/services/README.rst | 2 ++ puppet/services/services.yaml | 5 +++++ 2 files changed, 7 insertions(+) (limited to 'puppet') 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. diff --git a/puppet/services/services.yaml b/puppet/services/services.yaml index bb40001a..61606e6b 100644 --- a/puppet/services/services.yaml +++ b/puppet/services/services.yaml @@ -50,4 +50,9 @@ outputs: expression: list($.data.s_names.where($ != null)) data: {s_names: {get_attr: [ServiceChain, role_data, service_name]}} config_settings: {map_merge: {get_attr: [ServiceChain, role_data, config_settings]}} + global_config_settings: + map_merge: + yaql: + expression: list($.data.configs.where($ != null)) + data: {configs: {get_attr: [ServiceChain, role_data, global_config_settings]}} step_config: {list_join: ["\n", {get_attr: [ServiceChain, role_data, step_config]}]} -- cgit 1.2.3-korg