diff --git a/deployment/puppet/ceph/manifests/conf.pp b/deployment/puppet/ceph/manifests/conf.pp index 3d2fe2cf5a..e3858d88c8 100644 --- a/deployment/puppet/ceph/manifests/conf.pp +++ b/deployment/puppet/ceph/manifests/conf.pp @@ -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'] diff --git a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp index 4847959e81..bc9c64c81b 100644 --- a/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp +++ b/deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp @@ -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, ' ')