openstack
/
tripleo-heat-templates
Code Issues Proposed changes

Merge "Rectify service_name in ceph monitor's hieradata" into stable/zed

This commit is contained in:
Zuul 2023-02-28 11:38:03 +00:00 committed by Gerrit Code Review
parent 2a553a5465 3e5813ab47
commit c9f9c3bf1c
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
ci/environments/scenario001-standalone.yaml
View File

@ -44,6 +44,12 @@ parameter_defaults:
# in sync with the archive policy, 60s too.
ceilometer::agent::polling::polling_interval: 15
tripleo::profile::base::metrics::qdr::interior_mesh_nodes: ''
collectd::plugin::ceph::daemons:
- 'ceph-mon.controller-00'
- 'ceph-mon.controller-01'
- 'ceph-mon.controller-02'
- 'ceph-osd.01'
- 'ceph-osd.07'
NotificationDriver: 'messagingv2'
ManagePolling: true
HeatConfigureDelegatedRoles: true

2
deployment/cephadm/ceph-mon.yaml
View File

@ -69,7 +69,7 @@ outputs:
- - '9100'
service_config_settings:
collectd:
tripleo.collectd.plugins.ceph_osd:
tripleo.collectd.plugins.ceph_mon:
- ceph
collectd::plugin::ceph::daemons: []
upgrade_tasks: {get_attr: [CephBase, role_data, upgrade_tasks]}