X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-osd.yaml;h=d18ccabfd683af01450b52ab5f584deb46c6d110;hb=5d13a6397c4dccc78dc13c4bf23d651485868904;hp=eaba271a88e3093527f14dcbd01e2678eed192b1;hpb=af9352e8007f8eb9a0bbec36a49e07328b0cd3f6;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml
index eaba271a..d18ccabf 100644
--- a/puppet/services/ceph-osd.yaml
+++ b/puppet/services/ceph-osd.yaml
@@ -4,6 +4,15 @@ 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
@@ -13,13 +22,22 @@ parameters:
 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
+      service_name: ceph_osd
       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