Move Ceph OSD data path configuration into static ceph.yaml file

Change-Id: I577dc98cdf3648c9eb77bd084ae18273a52b22f9

diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index e01bd19..c4a365b 100644 (file)
--- a/puppet/ceph-cluster-config.yaml
+++ b/puppet/ceph-cluster-config.yaml
@@ -36,7 +36,6 @@ resources:
                   - {get_param: ceph_mon_ips}
                 ceph::profile::params::fsid: {get_param: ceph_fsid}
                 ceph::profile::params::mon_key: {get_param: ceph_mon_key}
-                ceph::profile::params::osds: "{/srv/data: {}}"
                 # We should use a separated key for the non-admin clients
                 ceph::profile::params::client_keys:
                   str_replace:

diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index e43b0da..17fbea2 100644 (file)
--- a/puppet/hieradata/ceph.yaml
+++ b/puppet/hieradata/ceph.yaml
@@ -3,6 +3,7 @@ ceph::profile::params::osd_pool_default_pg_num: 128
 ceph::profile::params::osd_pool_default_pgp_num: 128
 ceph::profile::params::osd_pool_default_size: 3
 ceph::profile::params::osd_pool_default_min_size: 1
+ceph::profile::params::osds: {/srv/data: {}}
 ceph::profile::params::manage_repo: false
 ceph::profile::params::authentication_type: cephx