Merge "We don't need to set a default for the CephX keys and cluster FSID"

[apex-tripleo-heat-templates.git] / puppet / services / ceph-mon.yaml

diff --git a/puppet/services/ceph-mon.yaml b/puppet/services/ceph-mon.yaml
index 257264a..f48515e 100644 (file)
--- a/puppet/services/ceph-mon.yaml
+++ b/puppet/services/ceph-mon.yaml
@@ -13,7 +13,6 @@ parameters:
     default: False
     type: boolean
   CephMonKey:
-    default: ''
     description: The Ceph monitors key. Can be created with ceph-authtool --gen-print-key.
     type: string
     hidden: true
@@ -41,7 +40,7 @@ outputs:
   role_data:
     description: Role data for the Ceph Monitor service.
     value:
-      service_name: ceph-mon
+      service_name: ceph_mon
       config_settings:
         map_merge:
           - get_attr: [CephBase, role_data, config_settings]
@@ -54,9 +53,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