From: Jenkins <jenkins@review.openstack.org>
Date: Fri, 9 Sep 2016 09:20:21 +0000 (+0000)
Subject: Merge "Add global_config_settings to services' output"
X-Git-Tag: opnfv-6.0.0~1631
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=56486057c7c242745a4d44df5a03947ef49b49e7;p=apex-tripleo-heat-templates.git

Merge "Add global_config_settings to services' output"
---

56486057c7c242745a4d44df5a03947ef49b49e7
diff --cc overcloud.yaml
index f2c4b631,47a59bdb..97bfe015
--- a/overcloud.yaml
+++ b/overcloud.yaml
@@@ -453,9 -410,16 +453,17 @@@ 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]}
  
    ComputeServiceChain:
      type: OS::TripleO::Services
@@@ -485,9 -449,15 +493,16 @@@
                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]}
  
    BlockStorageServiceChain:
      type: OS::TripleO::Services
@@@ -518,9 -488,15 +533,16 @@@
            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]}
  
    ObjectStorageServiceChain:
      type: OS::TripleO::Services
@@@ -551,9 -527,15 +573,16 @@@
            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]}
  
    CephStorageServiceChain:
      type: OS::TripleO::Services
@@@ -584,9 -566,15 +613,16 @@@
            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]}
  
    ControllerIpListMap:
      type: OS::TripleO::Network::Ports::NetIpListMap
diff --cc puppet/services/services.yaml
index 669e2872,61606e6b..b54a6d7a
--- a/puppet/services/services.yaml
+++ b/puppet/services/services.yaml
@@@ -49,9 -49,10 +49,14 @@@ outputs
          yaql:
            expression: list($.data.s_names.where($ != null))
            data: {s_names: {get_attr: [ServiceChain, role_data, service_name]}}
 +      monitoring_subscriptions:
 +        yaql:
 +          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]}]}