X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-external.yaml;h=7d75074ce30ed355f3707bba05ead58994fc1491;hb=e60c5377fb4b6dd96a8415b03e88005b3eab603c;hp=4522f416e16812be2844ef08e551586e8bf6e128;hpb=f91f08a5288820a77f45099092914a65a038caa5;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index 4522f416..7d75074c 100644
--- 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:
@@ -35,11 +33,30 @@ parameters:
   NovaRbdPoolName:
     default: vms
     type: string
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
+  EndpointMap:
+    default: {}
+    description: Mapping of service endpoint -> protocol. Typically set
+                 via parameter_defaults in the resource registry.
+    type: json
+  MonitoringSubscriptionCephExternal:
+    default: 'overcloud-ceph-external'
+    type: string
 
 outputs:
   role_data:
     description: Role data for the Ceph External service.
     value:
+      service_name: ceph_external
+      monitoring_subscription: {get_param: MonitoringSubscriptionCephExternal}
       config_settings:
         tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost}
         ceph::profile::params::fsid: {get_param: CephClusterFSID}
@@ -61,5 +78,7 @@ outputs:
               CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
               GLANCE_POOL: {get_param: GlanceRbdPoolName}
               GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
+      service_config_settings:
+        get_attr: [CephBase, role_data, service_config_settings]
       step_config: |
         include ::tripleo::profile::base::ceph::client