X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=puppet%2Fservices%2Fpacemaker%2Fglance-api.yaml;h=684785af39265272100309f1e49c1d982e95ace9;hb=d6837ea4a62ec74c4b06901c257fe4d6f4bea73c;hp=5a581dcaf9dfc036a99f0e9e887a20bb9f729910;hpb=749d24ec9d6d6c3d0198a287bd7adebca263d7b3;p=apex-tripleo-heat-templates.git

diff --git a/puppet/services/pacemaker/glance-api.yaml b/puppet/services/pacemaker/glance-api.yaml
index 5a581dca..684785af 100644
--- a/puppet/services/pacemaker/glance-api.yaml
+++ b/puppet/services/pacemaker/glance-api.yaml
@@ -4,6 +4,15 @@ description: >
   OpenStack Glance API service with Pacemaker configured with Puppet.
 
 parameters:
+  ServiceNetMap:
+    default: {}
+    description: Mapping of service_name -> network name. Typically set
+                 via parameter_defaults in the resource registry.  This
+                 mapping overrides those in ServiceNetMapDefaults.
+    type: json
+  DefaultPasswords:
+    default: {}
+    type: json
   EndpointMap:
     default: {}
     description: Mapping of service endpoint -> protocol. Typically set
@@ -39,12 +48,16 @@ resources:
   GlanceApiBase:
     type: ../glance-api.yaml
     properties:
+      ServiceNetMap: {get_param: ServiceNetMap}
+      DefaultPasswords: {get_param: DefaultPasswords}
       EndpointMap: {get_param: EndpointMap}
 
 outputs:
   role_data:
     description: Role data for the Glance role.
     value:
+      service_name: glance_api
+      monitoring_subscription: {get_attr: [GlanceApiBase, role_data, monitoring_subscription]}
       config_settings:
         map_merge:
           - get_attr: [GlanceApiBase, role_data, config_settings]
@@ -52,6 +65,7 @@ outputs:
             glance_file_pcmk_fstype: {get_param: GlanceFilePcmkFstype}
             glance_file_pcmk_manage: {get_param: GlanceFilePcmkManage}
             glance_file_pcmk_options: {get_param: GlanceFilePcmkOptions}
+            glance_file_pcmk_directory: '/var/lib/glance/images'
             glance::api::manage_service: false
             glance::api::enabled: false
       step_config: |