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

diff --git a/puppet/hieradata/ceph.yaml b/puppet/hieradata/ceph.yaml
index ccb41cc..c8c5804 100644 (file)
--- 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 3bda874..e7ae521 100644 (file)
--- 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 219f0d0..54b3d41 100644 (file)
--- 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 71c53b4..905ea30 100644 (file)
--- 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 d93817e..05d4b69 100644 (file)
--- 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 da526e3..5aa0cfb 100644 (file)
--- 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 dd0582f..42b85e1 100644 (file)
--- 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 bec4340..bce52f3 100644 (file)
--- 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: