From c14d4a9fea699512afab6cc5960dddf6bab60c5b Mon Sep 17 00:00:00 2001 From: Giulio Fidente Date: Mon, 25 Jul 2016 15:27:56 +0200 Subject: Set MDS/OSD firewall ports from ceph-osd template Change-Id: Ie8d1678e6e32271ff31ea9dd7fcf7ef9e8956b86 --- puppet/services/ceph-mon.yaml | 3 +-- puppet/services/ceph-osd.yaml | 7 ++++++- 2 files changed, 7 insertions(+), 3 deletions(-) (limited to 'puppet/services') 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 -- cgit 1.2.3-korg