diff options
author | Jenkins <jenkins@review.openstack.org> | 2017-09-07 16:39:47 +0000 |
---|---|---|
committer | Gerrit Code Review <review@openstack.org> | 2017-09-07 16:39:47 +0000 |
commit | be67dc8a50ef5ad85fae18fc9cafe74cc19636f9 (patch) | |
tree | 96c59b730d8ea72777f5424e6e5c8732c6c9c52d /overcloud.j2.yaml | |
parent | 24b8d7835d2d299bc37e2f17d923fd92e5709e46 (diff) | |
parent | b5783b3be42a3f674956d1d8af5cd2bcc4f3a272 (diff) |
Merge "fluentd: log configuration was not generated correctly" into stable/pike
Diffstat (limited to 'overcloud.j2.yaml')
-rw-r--r-- | overcloud.j2.yaml | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/overcloud.j2.yaml b/overcloud.j2.yaml index d621244e..367ac5b6 100644 --- a/overcloud.j2.yaml +++ b/overcloud.j2.yaml @@ -545,6 +545,8 @@ resources: ServiceConfigSettings: {get_attr: [{{role.name}}ServiceConfigSettings, value]} ServiceNames: {get_attr: [{{role.name}}ServiceNames, value]} MonitoringSubscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]} + LoggingSources: {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_sources]} + LoggingGroups: {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_groups]} ServiceMetadataSettings: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_metadata_settings]} DeploymentServerBlacklistDict: {get_attr: [DeploymentServerBlacklistDict, value]} RoleParameters: {get_param: {{role.name}}Parameters} @@ -636,24 +638,6 @@ resources: {% for role in roles %} - {get_attr: [{{role.name}}ServiceNames, value]} {% endfor %} - logging_groups: - yaql: - expression: > - $.data.groups.flatten() - data: - groups: -{% for role in roles %} - - {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_groups]} -{% endfor %} - logging_sources: - yaql: - expression: > - $.data.sources.flatten() - data: - sources: -{% for role in roles %} - - {get_attr: [{{role.name}}ServiceChainRoleData, value, logging_sources]} -{% endfor %} controller_ips: {get_attr: [{{primary_role_name}}, ip_address]} controller_names: {get_attr: [{{primary_role_name}}, hostname]} service_ips: |