Merge "Remove double tcp_listen_options entries for rabbit"

[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 959cee2..7d75074 100644 (file)
--- a/puppet/services/ceph-external.yaml
+++ b/puppet/services/ceph-external.yaml
@@ -47,12 +47,16 @@ parameters:
     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}
@@ -74,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