openstack/fuel-library
Code Issues Proposed changes

Merge "Fix resource ordering for Ceph_conf"

Browse Source
This commit is contained in:
Jenkins 2015-12-22 06:46:21 +00:00 committed by Gerrit Code Review
commit 7ddb373ac9
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'] -> 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'] -> Exec['ceph-deploy gatherkeys remote'] ->
File['/etc/ceph/ceph.client.admin.keyring'] -> File['/etc/ceph/ceph.client.admin.keyring'] ->
Exec['ceph-deploy init config'] 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/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']; '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, ' ') $osd_devices = split($::osd_devices_list, ' ')