diff options
| -rw-r--r-- | puppet/hieradata/ceph.yaml | 9 | ||||
| -rw-r--r-- | puppet/hieradata/common.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/compute.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/controller.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/database.yaml | 2 | ||||
| -rw-r--r-- | puppet/hieradata/object.yaml | 3 | ||||
| -rw-r--r-- | puppet/hieradata/volume.yaml | 2 | ||||
| -rw-r--r-- | puppet/services/ceph-base.yaml | 7 |
8 files changed, 17 insertions, 12 deletions
diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml index ccb41cc4..c8c5804b 100644 --- a/puppet/hieradata/ceph.yaml +++ b/puppet/hieradata/ceph.yaml @@ -1,9 +1,2 @@ -ceph::profile::params::osd_pool_default_pg_num: 32 -ceph::profile::params::osd_pool_default_pgp_num: 32 -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 - +# Do not add hieradata in this file, and use composable services. ceph_classes: [] diff --git a/puppet/hieradata/common.yaml b/puppet/hieradata/common.yaml index 3bda874f..e7ae521e 100644 --- a/puppet/hieradata/common.yaml +++ b/puppet/hieradata/common.yaml @@ -1,3 +1,5 @@ +# Do not add hieradata in this file, and use composable services. + # TODO(emilien) move it to composable aodh roles later aodh::auth::auth_region: 'regionOne' aodh::auth::auth_tenant_name: 'service' diff --git a/puppet/hieradata/compute.yaml b/puppet/hieradata/compute.yaml index 219f0d0a..54b3d412 100644 --- a/puppet/hieradata/compute.yaml +++ b/puppet/hieradata/compute.yaml @@ -1,3 +1,3 @@ -# Hiera data here applies to all compute nodes +# Do not add hieradata in this file, and use composable services. compute_classes: [] diff --git a/puppet/hieradata/controller.yaml b/puppet/hieradata/controller.yaml index 71c53b47..905ea304 100644 --- a/puppet/hieradata/controller.yaml +++ b/puppet/hieradata/controller.yaml @@ -1,4 +1,4 @@ -# Hiera data here applies to all controller nodes +# Do not add hieradata in this file, and use composable services. # TODO(emilien) move it to composable aodh roles later aodh::api::keystone_tenant: 'service' diff --git a/puppet/hieradata/database.yaml b/puppet/hieradata/database.yaml index d93817e7..05d4b697 100644 --- a/puppet/hieradata/database.yaml +++ b/puppet/hieradata/database.yaml @@ -1,3 +1,5 @@ +# Do not add hieradata in this file, and use composable services. + # Aodh # TODO(emilien) move it to composable aodh roles later aodh::db::mysql::user: aodh diff --git a/puppet/hieradata/object.yaml b/puppet/hieradata/object.yaml index da526e39..5aa0cfb6 100644 --- a/puppet/hieradata/object.yaml +++ b/puppet/hieradata/object.yaml @@ -1,2 +1,3 @@ -# Hiera data for swift storage nodes +# Do not add hieradata in this file, and use composable services. + object_classes: [] diff --git a/puppet/hieradata/volume.yaml b/puppet/hieradata/volume.yaml index dd0582fa..42b85e1a 100644 --- a/puppet/hieradata/volume.yaml +++ b/puppet/hieradata/volume.yaml @@ -1,3 +1,3 @@ -# Hiera data here applies to all volume storage nodes +# Do not add hieradata in this file, and use composable services. volume_classes: [] diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml index bec4340e..bce52f36 100644 --- a/puppet/services/ceph-base.yaml +++ b/puppet/services/ceph-base.yaml @@ -58,6 +58,13 @@ outputs: config_settings: tripleo::profile::base::ceph::ceph_ipv6: {get_param: CephIPv6} tripleo::profile::base::ceph::enable_ceph_storage: {get_param: ControllerEnableCephStorage} + ceph::profile::params::osd_pool_default_pg_num: 32 + ceph::profile::params::osd_pool_default_pgp_num: 32 + 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 ceph::profile::params::fsid: {get_param: CephClusterFSID} ceph::profile::params::client_keys: str_replace: |