diff options
| author |   Jenkins <jenkins@review.openstack.org> | 2015-05-05 08:58:36 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <review@openstack.org> | 2015-05-05 08:58:36 +0000 |
| commit | 48c3627baae7a061b22f273c3d55151577085895 (patch) | |
| tree | 4a224091bba6f078e32950b8e6dba38604cb0f1e | |
| parent | 4d4a544c26ffca49a47a90d511996d3bdb2c1d06 (diff) | |
| parent | 2de01bc4fb0f492c935f22630f7a19f8c2c08f4d (diff) | |
Merge "Move Ceph OSD data path configuration into static ceph.yaml file"
| -rw-r--r-- | puppet/ceph-cluster-config.yaml | 1 | ||||
| -rw-r--r-- | puppet/hieradata/ceph.yaml | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/puppet/ceph-cluster-config.yaml b/puppet/ceph-cluster-config.yaml index f4673122..e5be5c9d 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 33ce5efe..280457df 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 |