diff options
| author |   Giulio Fidente <gfidente@redhat.com> | 2017-06-22 17:25:03 +0200 |
|---|---|---|
| committer | Giulio Fidente <gfidente@redhat.com> | 2017-07-14 13:44:04 +0200 |
| commit | baf6eee5016fac7004a7b8be6f78d4505f347aeb (patch) | |
| tree | c0c5504b60b0c234623f601a2ca34fd89c2080d2 /puppet/services/logging | |
| parent | aa5c511b827e4c3a7d6cd6021892648093427dbc (diff) | |
Adds network/cidr mapping into a new service property
Makes it possible to resolve network subnets within a service
template; the data is transported into a new property ServiceData
wired into every service which hopefully is generic enough to
be extended in the future and transport more data.
Data can be consumed in service templates to set config values
which need to know what is the subnet where a deamon operates (for
example the Ceph Public vs Cluster network).
Change-Id: I28e21c46f1ef609517175f7e7ee19e28d1c0cba2
Diffstat (limited to 'puppet/services/logging')
| -rw-r--r-- | puppet/services/logging/fluentd-base.yaml | 4 | ||||
| -rw-r--r-- | puppet/services/logging/fluentd-client.yaml | 5 | ||||
| -rw-r--r-- | puppet/services/logging/fluentd-config.yaml | 4 |
3 files changed, 13 insertions, 0 deletions
diff --git a/puppet/services/logging/fluentd-base.yaml b/puppet/services/logging/fluentd-base.yaml index 21049a9e..0ab157c7 100644 --- a/puppet/services/logging/fluentd-base.yaml +++ b/puppet/services/logging/fluentd-base.yaml @@ -3,6 +3,10 @@ heat_template_version: pike description: Fluentd base service parameters: + ServiceData: + default: {} + description: Dictionary packing service data + type: json ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set diff --git a/puppet/services/logging/fluentd-client.yaml b/puppet/services/logging/fluentd-client.yaml index e34f31fa..958306f8 100644 --- a/puppet/services/logging/fluentd-client.yaml +++ b/puppet/services/logging/fluentd-client.yaml @@ -3,6 +3,10 @@ heat_template_version: pike description: Fluentd client configured with Puppet parameters: + ServiceData: + default: {} + description: Dictionary packing service data + type: json ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set @@ -34,6 +38,7 @@ resources: EndpointMap: {get_param: EndpointMap} RoleName: {get_param: RoleName} RoleParameters: {get_param: RoleParameters} + ServiceData: {get_param: ServiceData} ServiceNetMap: {get_param: ServiceNetMap} DefaultPasswords: {get_param: DefaultPasswords} diff --git a/puppet/services/logging/fluentd-config.yaml b/puppet/services/logging/fluentd-config.yaml index 9ade6419..a2390545 100644 --- a/puppet/services/logging/fluentd-config.yaml +++ b/puppet/services/logging/fluentd-config.yaml @@ -3,6 +3,10 @@ heat_template_version: pike description: Fluentd logging configuration parameters: + ServiceData: + default: {} + description: Dictionary packing service data + type: json ServiceNetMap: default: {} description: Mapping of service_name -> network name. Typically set |