Merge "Force epmd listening to a specific address"

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

diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index 9120687..aaa9b03 100644 (file)
--- a/puppet/services/ceph-external.yaml
+++ b/puppet/services/ceph-external.yaml
@@ -1,4 +1,4 @@
-heat_template_version: 2016-10-14
+heat_template_version: ocata
 
 description: >
   Ceph External service.
@@ -61,6 +61,12 @@ parameters:
   MonitoringSubscriptionCephExternal:
     default: 'overcloud-ceph-external'
     type: string
+  RbdDefaultFeatures:
+    default: ''
+    description: The default features enabled when creating a block device
+                 image. Only applies to format 2 images. Set to '1' for Jewel
+                 clients using older Ceph servers.
+    type: string
 
 conditions:
   glance_multiple_locations:
@@ -81,6 +87,7 @@ outputs:
       config_settings:
         tripleo::profile::base::ceph::ceph_mon_host: {get_param: CephExternalMonHost}
         ceph::profile::params::fsid: {get_param: CephClusterFSID}
+        ceph::profile::params::rbd_default_features: {get_param: RbdDefaultFeatures}
         ceph::profile::params::client_keys:
           str_replace:
             template: "{
@@ -99,6 +106,14 @@ outputs:
               CINDERBACKUP_POOL: {get_param: CinderBackupRbdPoolName}
               GLANCE_POOL: {get_param: GlanceRbdPoolName}
               GNOCCHI_POOL: {get_param: GnocchiRbdPoolName}
+        ceph::profile::params::manage_repo: false
+        # FIXME(gfidente): we should not have to list the packages explicitly in
+        # the templates, but this should stay until the following is fixed:
+        # https://bugs.launchpad.net/puppet-ceph/+bug/1629933
+        ceph::params::packages:
+          - ceph-base
+          - ceph-mon
+          - ceph-osd
       service_config_settings:
         glance_api:
           glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}