Merge "Add hieradata for Manila v1 and v2 endpoints"

[apex-tripleo-heat-templates.git] / puppet / services / ceph-base.yaml

diff --git a/puppet/services/ceph-base.yaml b/puppet/services/ceph-base.yaml
index 76f649b..4702861 100644 (file)
--- a/puppet/services/ceph-base.yaml
+++ b/puppet/services/ceph-base.yaml
@@ -5,12 +5,10 @@ description: >
 
 parameters:
   CephAdminKey:
-    default: ''
     description: The Ceph admin client key. Can be created with ceph-authtool --gen-print-key.
     type: string
     hidden: true
   CephClientKey:
-    default: ''
     description: The Ceph client key. Can be created with ceph-authtool --gen-print-key. Currently only used for external Ceph deployments to create the openstack user keyring.
     type: string
     hidden: true
@@ -18,7 +16,6 @@ parameters:
     default: openstack
     type: string
   CephClusterFSID:
-    default: ''
     type: string
     description: The Ceph cluster FSID. Must be a UUID.
   CephIPv6:
@@ -57,10 +54,14 @@ outputs:
   role_data:
     description: Role data for the Ceph base service.
     value:
-      service_name: ceph-base
+      service_name: ceph_base
       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_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: