openstack
/
fuel-library
Code Issues Proposed changes

Fix resource ordering for Ceph_conf 

Ceph_conf provider can be used only if ceph.conf file exists.
ceph.conf is created by different commands depending on host
role, so we can use File['/root/ceph.conf'] as point after
which ceph_conf provider can be used.

Closes-bug: #1527185

Change-Id: I0ee4accf066a1482804c4b39c35010b71c74ef80
This commit is contained in:
iberezovskiy 2015-12-17 14:24:40 +03:00
parent 03558ce662
commit 6ba0600e51
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
deployment/puppet/ceph/manifests/conf.pp
View File

@ -91,8 +91,8 @@ class ceph::conf (
}
Exec['ceph-deploy config pull'] ->
Ceph_conf[['global/cluster_network', 'global/public_network']] ->
File['/root/ceph.conf'] ->
File['/root/ceph.conf'] ->
Ceph_conf[['global/cluster_network', 'global/public_network']] ->
Exec['ceph-deploy gatherkeys remote'] ->
File['/etc/ceph/ceph.client.admin.keyring'] ->
Exec['ceph-deploy init config']

2
deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp
View File

@ -67,6 +67,8 @@ if $ceph_tuning_settings != {} {
'osd/objecter_infilght_op_bytes' : value => $ceph_tuning_settings['objecter_infilght_op_bytes'];
'osd/filestore_max_sync_interval' : value => $ceph_tuning_settings['filestore_max_sync_interval'];
}
# File /root/ceph.conf is symlink which is created after /etc/ceph/ceph.conf in ceph::conf class
File<| title == '/root/ceph.conf' |> -> Ceph_conf <||>
}
$osd_devices = split($::osd_devices_list, ' ')