X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fglance-api.yaml;h=1baf120be3ae827bb92e856282c267ebfd8592f5;hb=56284a6dfb89ca01aee38aa4fa0a0a325774a5ab;hp=53cde963c9937e639ea4f637f86ff36ff8178070;hpb=5b2395a2ed7c5eb0b4f1b5c01467a6c5c095867b;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/glance-api.yaml b/puppet/services/glance-api.yaml
index 53cde963..1baf120b 100644
--- a/puppet/services/glance-api.yaml
+++ b/puppet/services/glance-api.yaml
@@ -4,6 +4,10 @@ description: >
   OpenStack Glance API service configured with Puppet
 
 parameters:
+  ServiceData:
+    default: {}
+    description: Dictionary packing service data
+    type: json
   ServiceNetMap:
     default: {}
     description: Mapping of service_name -> network name. Typically set
@@ -74,10 +78,10 @@ parameters:
   GlanceBackend:
     default: swift
     description: The short name of the Glance backend to use. Should be one
-      of swift, rbd, or file
+      of swift, rbd, cinder, or file
     type: string
     constraints:
-    - allowed_values: ['swift', 'file', 'rbd']
+    - allowed_values: ['swift', 'file', 'rbd', 'cinder']
   GlanceNfsEnabled:
     default: false
     description: >
@@ -153,6 +157,7 @@ resources:
   TLSProxyBase:
     type: OS::TripleO::Services::TLSProxyBase
     properties:
+      ServiceData: {get_param: ServiceData}
       ServiceNetMap: {get_param: ServiceNetMap}
       DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
@@ -206,6 +211,7 @@ outputs:
             glance::api::pipeline: 'keystone'
             glance::api::show_image_direct_url: true
             glance::api::show_multiple_locations: {if: [glance_multiple_locations, true, false]}
+            glance::api::os_region_name: {get_param: KeystoneRegion}
             # NOTE: bind IP is found in Heat replacing the network name with the
             # local node IP for the given network; replacement examples
             # (eg. for internal_api):