diff options
| author |   Emilien Macchi <emilien@redhat.com> | 2016-07-28 13:23:39 -0400 |
|---|---|---|
| committer | Emilien Macchi <emilien@redhat.com> | 2016-07-29 20:36:57 +0000 |
| commit | f67c4f76f5bf4fb1d2070bdfb19ead5bf3dc8d66 (patch) | |
| tree | 0e923800fd5254d241a7dfa248b7470e9c65588b /puppet/hieradata | |
| parent | 03fbc98601a96c6bd51915a25ac1f73cbc53239c (diff) | |
move hieradata/ceph into ceph-base service
Part of composable roles work, move hieradata/ceph into the ceph-base
profile directly.
Also add a comment in all hieradata files to stop adding more data and
use composable services.
Change-Id: I97cc22a253b547be6b99312b6072f53b428aae2c
Diffstat (limited to 'puppet/hieradata')
| -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 |
7 files changed, 10 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: [] |