aboutsummaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2015-04-22 16:42:14 +0200
committerGiulio Fidente <gfidente@redhat.com>2015-04-24 10:19:32 -0400
commit2de01bc4fb0f492c935f22630f7a19f8c2c08f4d (patch)
tree5f98fadb0de24b28840c60eb40a24343d3d481e0 /puppet
parent1781c64bfc9cc929355b28344d0e34b2347e6ffe (diff)
Move Ceph OSD data path configuration into static ceph.yaml file
Change-Id: I577dc98cdf3648c9eb77bd084ae18273a52b22f9
Diffstat (limited to 'puppet')
-rw-r--r--puppet/ceph-cluster-config.yaml1
-rw-r--r--puppet/hieradata/ceph.yaml1
2 files changed, 1 insertions, 1 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml
index e01bd19d..c4a365bd 100644
--- 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 e43b0da5..17fbea25 100644
--- 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