From 6ba0600e516297b214714256558d17c525f64e18 Mon Sep 17 00:00:00 2001 From: iberezovskiy Date: Thu, 17 Dec 2015 14:24:40 +0300 Subject: [PATCH] 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 --- deployment/puppet/ceph/manifests/conf.pp | 4 ++-- deployment/puppet/osnailyfacter/modular/ceph/ceph-osd.pp | 2 ++ 2 files changed, 4 insertions(+), 2 deletions(-) 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, ' ')