X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-osd.yaml;h=f6378720bf9e25922c878553ace149856aa326b8;hb=370d392dc58a124ffe09800476d1099bf6268cb3;hp=24f60283a4a2ef35fccefc62fa4945842020af6b;hpb=314430e8f71b8908efb064bb81969e8c39eb1341;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml
index 24f60283..f6378720 100644
--- a/puppet/services/ceph-osd.yaml
+++ b/puppet/services/ceph-osd.yaml
@@ -4,21 +4,44 @@ description: >
   Ceph OSD service.
 
 parameters:
+  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
+  MonitoringSubscriptionCephOsd:
+    default: 'overcloud-ceph-osd'
+    type: string
 
 resources:
   CephBase:
     type: ./ceph-base.yaml
+    properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
+      EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Cinder OSD service.
     value:
+      service_name: ceph_osd
+      monitoring_subscription: {get_param: MonitoringSubscriptionCephOsd}
       config_settings:
-        get_attr: [CephBase, role_data, config_settings]
+        map_merge:
+          - get_attr: [CephBase, role_data, config_settings]
+          - tripleo.ceph_osd.firewall_rules:
+              '111 ceph_osd':
+                dport:
+                  - '6800-7300'
       step_config: |
         include ::tripleo::profile::base::ceph::osd