Set MDS/OSD firewall ports from ceph-osd template

Change-Id: Ie8d1678e6e32271ff31ea9dd7fcf7ef9e8956b86

diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 257264a..8df7683 100644 (file)
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -54,9 +54,8 @@ outputs:
               - {get_param: GlanceRbdPoolName}
               - {get_param: GnocchiRbdPoolName}
             tripleo.ceph_mon.firewall_rules:
-              '110 ceph':
+              '110 ceph_mon':
                 dport:
                   - 6789
-                  - '6800-6810'
       step_config: |
         include ::tripleo::profile::base::ceph::mon

diff --git a/puppet/services/ceph-osd.yaml b/puppet/services/ceph-osd.yaml
index eaba271..b6f464b 100644 (file)
--- a/puppet/services/ceph-osd.yaml
+++ b/puppet/services/ceph-osd.yaml
@@ -20,6 +20,11 @@ outputs:
     value:
       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