aboutsummaryrefslogtreecommitdiffstats
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
parent27c38e3784973ce368e1213daef0061a5f8ae503 (diff)
parent7aeb416528df98f3e5ba0dda8878f7b9c6bb55ec (diff)
Merge "Add global_config_settings to services' output"
-rw-r--r--overcloud.yaml46
-rw-r--r--puppet/services/README.rst2
-rw-r--r--puppet/services/services.yaml5
3 files changed, 48 insertions, 5 deletions
diff --git a/overcloud.yaml b/overcloud.yaml
index f2c4b631..97bfe015 100644
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@ -453,7 +453,15 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
NodeIndex: '%index%'
- ServiceConfigSettings: {get_attr: [ControllerServiceChain, role_data, config_settings]}
+ ServiceConfigSettings:
+ map_merge:
+ - get_attr: [ControllerServiceChain, role_data, config_settings]
+ - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+ - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+ - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [ControllerServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [ControllerServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [ControllerServiceChain, role_data, monitoring_subscriptions]}
@@ -485,7 +493,14 @@ resources:
params:
'%stackname%': {get_param: 'OS::stack_name'}
NodeIndex: '%index%'
- ServiceConfigSettings: {get_attr: [ComputeServiceChain, role_data, config_settings]}
+ ServiceConfigSettings:
+ map_merge:
+ - get_attr: [ComputeServiceChain, role_data, config_settings]
+ - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+ - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+ - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [ComputeServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [ComputeServiceChain, role_data, monitoring_subscriptions]}
@@ -518,7 +533,14 @@ resources:
CloudDomain: {get_param: CloudDomain}
ServerMetadata: {get_param: ServerMetadata}
NodeIndex: '%index%'
- ServiceConfigSettings: {get_attr: [BlockStorageServiceChain, role_data, config_settings]}
+ ServiceConfigSettings:
+ map_merge:
+ - get_attr: [BlockStorageServiceChain, role_data, config_settings]
+ - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+ - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+ - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [BlockStorageServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [BlockStorageServiceChain, role_data, monitoring_subscriptions]}
@@ -551,7 +573,14 @@ resources:
CloudDomain: {get_param: CloudDomain}
ServerMetadata: {get_param: ServerMetadata}
NodeIndex: '%index%'
- ServiceConfigSettings: {get_attr: [ObjectStorageServiceChain, role_data, config_settings]}
+ ServiceConfigSettings:
+ map_merge:
+ - get_attr: [ObjectStorageServiceChain, role_data, config_settings]
+ - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+ - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+ - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [ObjectStorageServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [ObjectStorageServiceChain, role_data, monitoring_subscriptions]}
@@ -584,7 +613,14 @@ resources:
CloudDomain: {get_param: CloudDomain}
ServerMetadata: {get_param: ServerMetadata}
NodeIndex: '%index%'
- ServiceConfigSettings: {get_attr: [CephStorageServiceChain, role_data, config_settings]}
+ ServiceConfigSettings:
+ map_merge:
+ - get_attr: [CephStorageServiceChain, role_data, config_settings]
+ - get_attr: [ControllerServiceChain, role_data, global_config_settings]
+ - get_attr: [ComputeServiceChain, role_data, global_config_settings]
+ - get_attr: [BlockStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [ObjectStorageServiceChain, role_data, global_config_settings]
+ - get_attr: [CephStorageServiceChain, role_data, global_config_settings]
ServiceNames: {get_attr: [CephStorageServiceChain, role_data, service_names]}
MonitoringSubscriptions: {get_attr: [CephStorageServiceChain, role_data, monitoring_subscriptions]}
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 669e2872..b54a6d7a 100644
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@ -54,4 +54,9 @@ outputs:
expression: list($.data.subscriptions.where($ != null))
data: {subscriptions: {get_attr: [ServiceChain, role_data, monitoring_subscription]}}
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]}]}