fluentd: log configuration was not generated correctly

fluentd hiera elements were being set in all_nodes.json, but then were
overwritten by values in <role>.json (e.g., controller.json). This
commit removes the values from all-nodes.json and ensures that they
are set correctly in <role>.json.

Closes-Bug: #1713240
Change-Id: I2b4c74c2a807f8e2fed57112f06b3791701bbe95
This commit is contained in:
Lars Kellogg-Stedman 2017-08-25 21:36:44 -07:00
parent 55383ffac6
commit d9db0c5f4f
2 changed files with 2 additions and 24 deletions

View File

@ -533,6 +533,8 @@ resources:
ServiceConfigSettings: {get_attr: [{{role.name}}ServiceConfigSettings, value]} ServiceConfigSettings: {get_attr: [{{role.name}}ServiceConfigSettings, value]}
ServiceNames: {get_attr: [{{role.name}}ServiceNames, value]} ServiceNames: {get_attr: [{{role.name}}ServiceNames, value]}
MonitoringSubscriptions: {get_attr: [{{role.name}}ServiceChainRoleData, value, monitoring_subscriptions]} 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]} ServiceMetadataSettings: {get_attr: [{{role.name}}ServiceChainRoleData, value, service_metadata_settings]}
DeploymentServerBlacklistDict: {get_attr: [DeploymentServerBlacklistDict, value]} DeploymentServerBlacklistDict: {get_attr: [DeploymentServerBlacklistDict, value]}
RoleParameters: {get_param: {{role.name}}Parameters} RoleParameters: {get_param: {{role.name}}Parameters}
@ -623,24 +625,6 @@ resources:
- ',' - ','
{% for role in roles %} {% for role in roles %}
- {get_attr: [{{role.name}}ServiceNames, value]} - {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 %} {% endfor %}
controller_ips: {get_attr: [{{primary_role_name}}, ip_address]} controller_ips: {get_attr: [{{primary_role_name}}, ip_address]}
controller_names: {get_attr: [{{primary_role_name}}, hostname]} controller_names: {get_attr: [{{primary_role_name}}, hostname]}

View File

@ -16,10 +16,6 @@ parameters:
type: comma_delimited_list type: comma_delimited_list
controller_ips: controller_ips:
type: comma_delimited_list type: comma_delimited_list
logging_groups:
type: json
logging_sources:
type: json
service_ips: service_ips:
type: json type: json
service_node_names: service_node_names:
@ -113,8 +109,6 @@ resources:
bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip} bootstrap_nodeid_ip: {get_input: bootstrap_nodeid_ip}
all_nodes: all_nodes:
map_merge: map_merge:
- tripleo::profile::base::logging::fluentd::fluentd_sources: {get_param: logging_sources}
- tripleo::profile::base::logging::fluentd::fluentd_groups: {get_param: logging_groups}
- enabled_services: - enabled_services:
yaql: yaql:
expression: $.data.distinct() expression: $.data.distinct()