summaryrefslogtreecommitdiffstats
path: root/puppet
diff options
context:
space:
mode:
authorGiulio Fidente <gfidente@redhat.com>2016-07-25 15:27:56 +0200
committerGiulio Fidente <gfidente@redhat.com>2016-07-25 15:27:56 +0200
commitc14d4a9fea699512afab6cc5960dddf6bab60c5b (patch)
tree4c9aeecfedf616616d96d180491e540225581dd0 /puppet
parent5195d7f8910f7d1ce0895caa133b028a727f8622 (diff)
Set MDS/OSD firewall ports from ceph-osd template
Change-Id: Ie8d1678e6e32271ff31ea9dd7fcf7ef9e8956b86
Diffstat (limited to 'puppet')
-rw-r--r--puppet/services/ceph-mon.yaml3
-rw-r--r--puppet/services/ceph-osd.yaml7
2 files changed, 7 insertions, 3 deletions
diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 257264ac..8df7683d 100644
--- 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 eaba271a..b6f464bb 100644
--- 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