Merge "Add ceph cluster's fsid to collectd hieradata" into stable/zed
This commit is contained in:
commit
2f0f7794f3
|
@ -312,7 +312,18 @@ parameters:
|
|||
default:
|
||||
tag: collectd
|
||||
file: /var/log/containers/collectd/collectd.log
|
||||
|
||||
DeployedCeph:
|
||||
default: False
|
||||
type: boolean
|
||||
description: |
|
||||
If the Ceph cluster has already been deployed but needs to be configured
|
||||
so that the overcloud can use it (create cephx keys, pools, configure RGW
|
||||
with haproxy, etc), then this parameter should be set to true. Set this
|
||||
parameter to false to have cephadm deploy the ceph cluster during overcloud
|
||||
deployment. DeployedCeph and CephDynamicSpec are mutually exclusive.
|
||||
CephClusterFSID:
|
||||
type: string
|
||||
description: The Ceph cluster FSID. Must be a UUID.
|
||||
|
||||
conditions:
|
||||
amqp_connection:
|
||||
|
@ -539,6 +550,10 @@ outputs:
|
|||
- {get_param: CollectdEnableLibpodstats}
|
||||
- tripleo::profile::base::metrics::collectd::enable_libpodstats:
|
||||
get_param: CollectdEnableLibpodstats
|
||||
- if:
|
||||
- {get_param: DeployedCeph}
|
||||
- collectd::plugin::ceph::ceph_fsid:
|
||||
get_param: CephClusterFSID
|
||||
service_config_settings:
|
||||
rsyslog:
|
||||
tripleo_logging_sources_collectd:
|
||||
|
|
Loading…
Reference in New Issue