Merge "Move neutron's kestone::auth parameters to server profile"

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

diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index b656e24..f6fe26d 100644 (file)
--- a/puppet/services/ceph-external.yaml
+++ b/puppet/services/ceph-external.yaml
@@ -5,7 +5,6 @@ description: >
 
 parameters:
   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
@@ -13,7 +12,6 @@ parameters:
     default: openstack
     type: string
   CephClusterFSID:
-    default: ''
     type: string
     description: The Ceph cluster FSID. Must be a UUID.
   CephExternalMonHost:
@@ -40,7 +38,7 @@ outputs:
   role_data:
     description: Role data for the Ceph External service.
     value:
-      service_name: ceph-external
+      service_name: ceph_external
       config_settings:
         tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost}
         ceph::profile::params::fsid: {get_param: CephClusterFSID}