X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fceph-external.yaml;h=97e44159b1206078ee76a28214de4a939d9c2158;hb=f3c58d50d327e4bbd1bc9cdd70710ba9778336a3;hp=3d64cf44d8da3debd43aa7759ceb595b249c082d;hpb=1916259308c645d659a4428e26c16a4c5a89c9e4;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/ceph-external.yaml b/puppet/services/ceph-external.yaml
index 3d64cf44..97e44159 100644
--- a/puppet/services/ceph-external.yaml
+++ b/puppet/services/ceph-external.yaml
@@ -1,4 +1,4 @@
-heat_template_version: ocata
+heat_template_version: pike
 
 description: >
   Ceph External service.
@@ -27,23 +27,16 @@ parameters:
   GlanceRbdPoolName:
     default: images
     type: string
-  GlanceBackend:
-    default: swift
-    description: The short name of the Glance backend to use. Should be one
-      of swift, rbd, or file
-    type: string
-    constraints:
-    - allowed_values: ['swift', 'file', 'rbd']
   GnocchiRbdPoolName:
     default: metrics
     type: string
-  NovaEnableRbdBackend:
-    default: false
-    description: Whether to enable or not the Rbd backend for Nova
-    type: boolean
   NovaRbdPoolName:
     default: vms
     type: string
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -76,16 +69,6 @@ parameters:
                  clients using older Ceph servers.
     type: string
 
-conditions:
-  glance_multiple_locations:
-    and:
-    - equals:
-      - get_param: GlanceBackend
-      - rbd
-    - equals:
-      - get_param: NovaEnableRbdBackend
-      - true
-
 outputs:
   role_data:
     description: Role data for the Ceph External service.
@@ -122,8 +105,5 @@ outputs:
           - ceph-base
           - ceph-mon
           - ceph-osd
-      service_config_settings:
-        glance_api:
-          glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
       step_config: |
         include ::tripleo::profile::base::ceph::client