Merge "Don't create networks if neutron is not enabled"

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

diff --git a/puppet/services/ceph-client.yaml b/puppet/services/ceph-client.yaml
index a9e4621..ec34fca 100644 (file)
--- a/puppet/services/ceph-client.yaml
+++ b/puppet/services/ceph-client.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-04-08
+heat_template_version: pike
 
 description: >
   Ceph Client service.
@@ -13,11 +13,22 @@ parameters:
   DefaultPasswords:
     default: {}
     type: json
+  RoleName:
+    default: ''
+    description: Role name on which the service is applied
+    type: string
+  RoleParameters:
+    default: {}
+    description: Parameters specific to the role
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
                  via parameter_defaults in the resource registry.
     type: json
+  MonitoringSubscriptionCephClient:
+    default: 'overcloud-ceph-client'
+    type: string
 
 resources:
   CephBase:
@@ -26,12 +37,15 @@ resources:
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
+      RoleName: {get_param: RoleName}
+      RoleParameters: {get_param: RoleParameters}
 
 outputs:
   role_data:
     description: Role data for the Cinder OSD service.
     value:
       service_name: ceph_client
+      monitoring_subscription: {get_param: MonitoringSubscriptionCephClient}
       config_settings:
         get_attr: [CephBase, role_data, config_settings]
       step_config: |