summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJenkins <jenkins@review.openstack.org>2016-07-26 11:11:18 +0000
committerGerrit Code Review <review@openstack.org>2016-07-26 11:11:18 +0000
commitf4b28ccfa1bd0e70ba10822c2b2f65bf03b43fbd (patch)
tree1f231074ca7437579130680d664b7eadc688fcb9
parent763b275d036e34c900a09cd92ee477e6b156f60b (diff)
parentc14d4a9fea699512afab6cc5960dddf6bab60c5b (diff)
Merge "Set MDS/OSD firewall ports from ceph-osd template"
-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